[Pkg-kde-commits] rev 1772 -
people/chrsmrtn/packages/gwenview/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Mon Sep 12 13:57:18 UTC 2005
Author: chrsmrtn
Date: 2005-09-12 13:55:17 +0000 (Mon, 12 Sep 2005)
New Revision: 1772
Modified:
people/chrsmrtn/packages/gwenview/debian/patches/98_buildprep.diff
Log:
New gwenview buildprep.
Modified: people/chrsmrtn/packages/gwenview/debian/patches/98_buildprep.diff
===================================================================
--- people/chrsmrtn/packages/gwenview/debian/patches/98_buildprep.diff 2005-09-12 13:54:37 UTC (rev 1771)
+++ people/chrsmrtn/packages/gwenview/debian/patches/98_buildprep.diff 2005-09-12 13:55:17 UTC (rev 1772)
@@ -1,7 +1,7 @@
-diff -Nru gwenview-1.2.0.orig/acinclude.m4 gwenview-1.2.0/acinclude.m4
---- gwenview-1.2.0.orig/acinclude.m4 2005-04-03 13:18:10.000000000 +0000
-+++ gwenview-1.2.0/acinclude.m4 2005-07-26 19:25:31.000000000 +0000
-@@ -1682,15 +1682,6 @@
+diff -Nru gwenview-1.3.0.orig/acinclude.m4 gwenview-1.3.0/acinclude.m4
+--- gwenview-1.3.0.orig/acinclude.m4 2005-09-11 10:39:24.000000000 -0400
++++ gwenview-1.3.0/acinclude.m4 2005-09-12 08:41:27.000000000 -0400
+@@ -1684,15 +1684,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -17,7 +17,7 @@
fi
AC_SUBST(KDE_USE_CLOSURE_TRUE)
AC_SUBST(KDE_USE_CLOSURE_FALSE)
-@@ -2131,9 +2122,6 @@
+@@ -2139,9 +2130,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -27,7 +27,33 @@
AC_TRY_COMPILE([
$2
],
-@@ -5686,6 +5674,7 @@
+@@ -3285,16 +3273,6 @@
+
+ AC_DEFUN([KDE_CHECK_AND_ADD_HIDDEN_VISIBILITY],
+ [
+- if test "$GXX" = "yes"; then
+- KDE_CHECK_COMPILER_FLAG(fvisibility=hidden,
+- [
+- CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+- KDE_CHECK_VISIBILITY_GCC_BUG
+-
+- HAVE_GCC_VISIBILITY=1
+- AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
+- ])
+- fi
+ ])
+
+ AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
+@@ -5816,7 +5794,7 @@
+ ##
+ ## You should have received a copy of the GNU General Public License
+ ## along with this program; if not, write to the Free Software
+-## Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA.
++## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ ##
+ ## As a special exception to the GNU General Public License, if you
+ ## distribute this file as part of a program that contains a
+@@ -5824,6 +5802,7 @@
## the same distribution terms that you use for the rest of that program.
# serial 47 AC_PROG_LIBTOOL
@@ -35,7 +61,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -5745,7 +5734,7 @@
+@@ -5883,7 +5862,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -44,7 +70,7 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -6159,12 +6148,11 @@
+@@ -6297,12 +6276,11 @@
if AC_TRY_EVAL(ac_compile); then
case "`/usr/bin/file conftest.o`" in
*32-bit*)
@@ -58,7 +84,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -6176,7 +6164,6 @@
+@@ -6314,7 +6292,6 @@
esac
;;
*64-bit*)
@@ -66,7 +92,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -6306,7 +6293,7 @@
+@@ -6444,7 +6421,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
@@ -75,7 +101,7 @@
case $build_os in
msdosdjgpp*)
-@@ -6335,20 +6322,26 @@
+@@ -6473,20 +6450,26 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -107,7 +133,7 @@
# Add a significant safety factor because C++ compilers can tack on massive
# amounts of additional arguments before passing them to the linker.
# It appears as though 1/2 is a usable value.
-@@ -6498,7 +6491,7 @@
+@@ -6636,7 +6619,7 @@
lt_cv_dlopen_self=yes
])
;;
@@ -116,7 +142,7 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -6587,13 +6580,6 @@
+@@ -6725,13 +6708,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -130,7 +156,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -6617,8 +6603,11 @@
+@@ -6755,8 +6731,11 @@
fi
fi
chmod u+w .
@@ -144,7 +170,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -6735,7 +6724,7 @@
+@@ -6873,7 +6852,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -153,7 +179,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -6748,7 +6737,7 @@
+@@ -6886,7 +6865,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -162,7 +188,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -6758,7 +6747,20 @@
+@@ -6896,7 +6875,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -184,7 +210,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -6823,7 +6825,7 @@
+@@ -6961,7 +6953,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -193,7 +219,7 @@
;;
beos*)
-@@ -6848,7 +6850,7 @@
+@@ -6986,7 +6978,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -202,7 +228,7 @@
need_version=no
need_lib_prefix=no
-@@ -6913,7 +6915,7 @@
+@@ -7051,7 +7043,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -211,7 +237,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -6936,7 +6938,7 @@
+@@ -7074,7 +7066,7 @@
dynamic_linker=no
;;
@@ -220,7 +246,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -6996,7 +6998,7 @@
+@@ -7134,7 +7126,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -229,7 +255,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -7011,7 +7013,7 @@
+@@ -7149,7 +7141,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -238,7 +264,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7022,7 +7024,7 @@
+@@ -7160,7 +7152,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -247,7 +273,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7084,22 +7086,19 @@
+@@ -7222,22 +7214,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -276,7 +302,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -7109,6 +7108,30 @@
+@@ -7247,6 +7236,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -307,7 +333,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -7118,7 +7141,7 @@
+@@ -7256,7 +7269,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -316,7 +342,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -7147,7 +7170,7 @@
+@@ -7285,7 +7298,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -325,7 +351,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -7167,7 +7190,7 @@
+@@ -7305,7 +7318,7 @@
os2*)
libname_spec='$name'
@@ -334,7 +360,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -7758,31 +7781,23 @@
+@@ -7896,31 +7909,23 @@
;;
cygwin*)
@@ -375,7 +401,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -7821,42 +7836,21 @@
+@@ -7959,42 +7964,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -425,7 +451,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
-@@ -7885,9 +7879,6 @@
+@@ -8023,9 +8007,6 @@
;;
osf3* | osf4* | osf5*)
@@ -435,7 +461,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7897,7 +7888,6 @@
+@@ -8035,7 +8016,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -443,7 +469,7 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -8163,7 +8153,7 @@
+@@ -8301,7 +8281,7 @@
fi
if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
@@ -452,7 +478,7 @@
else
AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
_LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
-@@ -8213,7 +8203,7 @@
+@@ -8351,7 +8331,7 @@
fi
;;
@@ -461,7 +487,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -8223,29 +8213,29 @@
+@@ -8361,29 +8341,29 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -470,15 +496,15 @@
;;
*) # Darwin 1.3 on
if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- ;;
- 10.*)
-- allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
+ case ${MACOSX_DEPLOYMENT_TARGET} in
@@ -505,7 +531,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8253,8 +8243,8 @@
+@@ -8391,8 +8371,8 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -516,7 +542,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -8362,8 +8352,8 @@
+@@ -8500,8 +8480,8 @@
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
if test "$with_gnu_ld" = yes; then
@@ -527,7 +553,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8389,7 +8379,7 @@
+@@ -8527,7 +8507,7 @@
# linker, instead of GNU ld. If possible, this setting should
# overridden to take advantage of the native linker features on
# the platform it is being used on.
@@ -536,7 +562,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -8419,8 +8409,22 @@
+@@ -8557,8 +8537,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -561,7 +587,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -8466,15 +8470,16 @@
+@@ -8604,15 +8598,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -582,7 +608,7 @@
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.
-@@ -8483,13 +8488,12 @@
+@@ -8621,13 +8616,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -598,7 +624,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -8504,7 +8508,7 @@
+@@ -8642,7 +8636,7 @@
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -607,7 +633,7 @@
fi
fi
;;
-@@ -8521,12 +8525,12 @@
+@@ -8659,12 +8653,12 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -622,7 +648,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -8535,7 +8539,7 @@
+@@ -8673,7 +8667,7 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -631,7 +657,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -8546,20 +8550,20 @@
+@@ -8684,20 +8678,20 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -640,15 +666,15 @@
;;
*) # Darwin 1.3 on
if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- ;;
- 10.*)
-- allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
+ case ${MACOSX_DEPLOYMENT_TARGET} in
@@ -662,7 +688,7 @@
fi
;;
esac
-@@ -8569,19 +8573,19 @@
+@@ -8707,19 +8701,19 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -688,7 +714,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8616,7 +8620,7 @@
+@@ -8754,7 +8748,7 @@
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
@@ -697,7 +723,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8638,7 +8642,7 @@
+@@ -8776,7 +8770,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
aCC)
@@ -706,7 +732,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8647,11 +8651,11 @@
+@@ -8785,11 +8779,11 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -720,7 +746,7 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8708,7 +8712,7 @@
+@@ -8846,7 +8840,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -729,7 +755,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -8729,7 +8733,7 @@
+@@ -8867,7 +8861,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -738,7 +764,7 @@
;;
esac
fi
-@@ -8744,7 +8748,7 @@
+@@ -8882,7 +8876,7 @@
case $cc_basename in
CC)
# SGI C++
@@ -747,7 +773,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -8755,9 +8759,9 @@
+@@ -8893,9 +8887,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -759,7 +785,7 @@
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -8774,8 +8778,8 @@
+@@ -8912,8 +8906,8 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -770,7 +796,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8797,16 +8801,16 @@
+@@ -8935,16 +8929,16 @@
# Intel C++
with_gnu_ld=yes
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -791,7 +817,7 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8844,7 +8848,7 @@
+@@ -8982,7 +8976,7 @@
;;
esac
;;
@@ -800,7 +826,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -8863,7 +8867,7 @@
+@@ -9001,7 +8995,7 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -809,7 +835,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8880,7 +8884,7 @@
+@@ -9018,7 +9012,7 @@
;;
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -818,7 +844,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8898,7 +8902,7 @@
+@@ -9036,7 +9030,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -827,7 +853,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8923,7 +8927,7 @@
+@@ -9061,7 +9055,7 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -836,7 +862,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8939,10 +8943,10 @@
+@@ -9077,10 +9071,10 @@
;;
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
@@ -849,7 +875,7 @@
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8961,7 +8965,7 @@
+@@ -9099,7 +9093,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -858,7 +884,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9018,9 +9022,9 @@
+@@ -9156,9 +9150,9 @@
CC)
# Sun C++ 4.2, 5.x and Centerline C++
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -870,7 +896,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -9054,7 +9058,7 @@
+@@ -9192,7 +9186,7 @@
;;
gcx)
# Green Hills C++ Compiler
@@ -879,7 +905,7 @@
# The C++ compiler must be used to create the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9064,9 +9068,9 @@
+@@ -9202,9 +9196,9 @@
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -891,7 +917,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9075,9 +9079,9 @@
+@@ -9213,9 +9207,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -903,7 +929,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9245,7 +9249,7 @@
+@@ -9383,7 +9377,7 @@
fi
;;
@@ -912,7 +938,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -9354,7 +9358,7 @@
+@@ -9492,7 +9486,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -921,7 +947,7 @@
test "$enable_shared" = yes && enable_static=no
;;
esac
-@@ -9496,11 +9500,12 @@
+@@ -9634,11 +9628,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -936,7 +962,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -9550,7 +9555,7 @@
+@@ -9688,7 +9683,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -945,7 +971,16 @@
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9681,7 +9686,7 @@
+@@ -9743,7 +9738,7 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA.
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -9819,7 +9814,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -954,7 +989,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -9712,7 +9717,7 @@
+@@ -9850,7 +9845,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -963,7 +998,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -9956,7 +9961,10 @@
+@@ -10094,7 +10089,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -975,7 +1010,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -10029,7 +10037,7 @@
+@@ -10167,7 +10165,7 @@
symcode='[[BCDEGQRST]]'
;;
solaris* | sysv5*)
@@ -984,7 +1019,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -10047,7 +10055,7 @@
+@@ -10185,7 +10183,7 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -993,7 +1028,7 @@
esac
# Try without a prefix undercore, then with it.
-@@ -10262,7 +10270,7 @@
+@@ -10400,7 +10398,7 @@
;;
esac
;;
@@ -1002,7 +1037,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -10313,7 +10321,7 @@
+@@ -10451,7 +10449,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
@@ -1011,7 +1046,7 @@
cxx)
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -10338,7 +10346,7 @@
+@@ -10476,7 +10474,7 @@
;;
esac
;;
@@ -1020,7 +1055,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -10649,6 +10657,9 @@
+@@ -10787,6 +10785,9 @@
cygwin* | mingw*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -1030,7 +1065,7 @@
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -10673,7 +10684,7 @@
+@@ -10811,7 +10812,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -1039,7 +1074,7 @@
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
# include_expsyms should be a list of space-separated symbols to be *always*
-@@ -10747,7 +10758,7 @@
+@@ -10885,7 +10886,7 @@
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -1048,7 +1083,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10757,13 +10768,13 @@
+@@ -10895,13 +10896,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -1064,7 +1099,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -10772,19 +10783,19 @@
+@@ -10910,19 +10911,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -1088,7 +1123,7 @@
fi
;;
-@@ -10802,8 +10813,8 @@
+@@ -10940,8 +10941,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -1099,7 +1134,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10816,10 +10827,36 @@
+@@ -10954,10 +10955,36 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
@@ -1138,7 +1173,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10869,9 +10906,20 @@
+@@ -11007,9 +11034,20 @@
else
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
fi
@@ -1161,7 +1196,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -10917,29 +10965,29 @@
+@@ -11055,29 +11093,29 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1200,7 +1235,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -10954,7 +11002,7 @@
+@@ -11092,7 +11130,7 @@
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -1209,7 +1244,7 @@
fi
fi
;;
-@@ -10977,13 +11025,13 @@
+@@ -11115,13 +11153,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -1226,7 +1261,7 @@
# The linker will automatically build a .lib file if we build a DLL.
_LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
# FIXME: Should let the user specify the lib program.
-@@ -10997,21 +11045,21 @@
+@@ -11135,21 +11173,21 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -1235,14 +1270,14 @@
;;
*) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- ;;
- 10.*)
-- allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
- fi
@@ -1261,7 +1296,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -11020,26 +11068,26 @@
+@@ -11158,26 +11196,26 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -1296,7 +1331,7 @@
;;
dgux*)
-@@ -11072,8 +11120,8 @@
+@@ -11210,8 +11248,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -1307,7 +1342,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11081,7 +11129,7 @@
+@@ -11219,7 +11257,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -1316,7 +1351,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -11099,10 +11147,10 @@
+@@ -11237,10 +11275,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -1329,7 +1364,7 @@
;;
esac
else
-@@ -11149,7 +11197,7 @@
+@@ -11287,7 +11325,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -1338,7 +1373,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-@@ -11159,7 +11207,7 @@
+@@ -11297,7 +11335,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -1347,7 +1382,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -11182,7 +11230,7 @@
+@@ -11320,7 +11358,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -1356,7 +1391,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
else
-@@ -11192,7 +11240,7 @@
+@@ -11330,7 +11368,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
;;
*)
@@ -1365,7 +1400,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
esac
-@@ -11203,14 +11251,14 @@
+@@ -11341,14 +11379,14 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -1382,7 +1417,7 @@
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -11222,7 +11270,7 @@
+@@ -11360,7 +11398,7 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1391,7 +1426,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-@@ -11247,9 +11295,9 @@
+@@ -11385,9 +11423,9 @@
solaris*)
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
if test "$GCC" = yes; then
@@ -1403,7 +1438,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -11269,7 +11317,7 @@
+@@ -11407,7 +11445,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -1412,7 +1447,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -11329,9 +11377,9 @@
+@@ -11467,9 +11505,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
_LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -1424,7 +1459,7 @@
fi
runpath_var='LD_RUN_PATH'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11389,7 +11437,7 @@
+@@ -11527,7 +11565,7 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -1433,7 +1468,7 @@
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -11548,8 +11596,8 @@
+@@ -11686,8 +11724,8 @@
fi
done
done
@@ -1443,12 +1478,12 @@
AC_MSG_RESULT([$SED])
])
-diff -Nru gwenview-1.2.0.orig/aclocal.m4 gwenview-1.2.0/aclocal.m4
---- gwenview-1.2.0.orig/aclocal.m4 2005-04-03 13:18:25.000000000 +0000
-+++ gwenview-1.2.0/aclocal.m4 2005-07-26 19:26:17.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/aclocal.m4 gwenview-1.3.0/aclocal.m4
+--- gwenview-1.3.0.orig/aclocal.m4 2005-09-11 10:39:36.000000000 -0400
++++ gwenview-1.3.0/aclocal.m4 2005-09-12 08:41:54.000000000 -0400
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.7.9 -*- Autoconf -*-
-+# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
++# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
@@ -1457,7 +1492,7 @@
# This file 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.
-@@ -11,11951 +11,53 @@
+@@ -11,12089 +11,53 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
@@ -1483,8 +1518,8 @@
-
-dnl You should have received a copy of the GNU Library General Public License
-dnl along with this library; see the file COPYING.LIB. If not, write to
--dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
--dnl Boston, MA 02111-1307, USA.
+-dnl the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
+-dnl Boston, MA 02110-1301, USA.
-
-dnl IMPORTANT NOTE:
-dnl Please do not modify this file unless you expect your modifications to be
@@ -2057,7 +2092,7 @@
- if test "$kde_qtsubver" -le 1; then
- kde32ornewer=
- fi
-- if test "$kde_qtsubver" -le 2; then
+- if test "$kde_qtsubver" -le 2 -o `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then
- kde33ornewer=
- fi
- fi
@@ -2270,6 +2305,7 @@
- KDE_CHECK_TYPES
- KDE_CHECK_LIBDL
- KDE_CHECK_STRLCPY
+- KDE_CHECK_PIE_SUPPORT
-
-# darwin needs this to initialize the environment
-AC_CHECK_HEADERS(crt_externs.h)
@@ -2641,15 +2677,15 @@
- if test $kde_qtsubver -gt 0; then
- if test $kde_qtsubver -gt 1; then
- if test $kde_qtsubver -gt 2; then
-- kde_qt_minversion=">= Qt 3.3"
+- kde_qt_minversion=">= Qt 3.3 and < 4.0"
- else
-- kde_qt_minversion=">= Qt 3.2"
+- kde_qt_minversion=">= Qt 3.2 and < 4.0"
- fi
- else
-- kde_qt_minversion=">= Qt 3.1 (20021021)"
+- kde_qt_minversion=">= Qt 3.1 (20021021) and < 4.0"
- fi
- else
-- kde_qt_minversion=">= Qt 3.0"
+- kde_qt_minversion=">= Qt 3.0 and < 4.0"
- fi
- fi
- if test "$kde_qtver" = "1"; then
@@ -2683,6 +2719,9 @@
- kde_qt_verstring="$3"
-fi
-
+-if test $kde_qtver = 4; then
+- kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
+-fi
-if test $kde_qtver = 3; then
- kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
-fi
@@ -2781,7 +2820,12 @@
-)
-
-USING_QT_MT=""
--
++# AM_AUTOMAKE_VERSION(VERSION)
++# ----------------------------
++# Automake X.Y traces this macro to ensure aclocal.m4 has been
++# generated from the m4 files accompanying Automake X.Y.
++AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
+
-dnl ------------------------------------------------------------------------
-dnl If we not get --disable-qt-mt then adjust some vars for the host.
-dnl ------------------------------------------------------------------------
@@ -2800,12 +2844,7 @@
-fi
-AC_SUBST(KDE_MT_LDFLAGS)
-AC_SUBST(KDE_MT_LIBS)
-+# AM_AUTOMAKE_VERSION(VERSION)
-+# ----------------------------
-+# Automake X.Y traces this macro to ensure aclocal.m4 has been
-+# generated from the m4 files accompanying Automake X.Y.
-+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-
+-
-kde_qt_was_given=yes
-
-dnl ------------------------------------------------------------------------
@@ -2819,22 +2858,17 @@
- fi
-fi
-
--if test -z "$LIBQT"; then
-dnl ------------------------------------------------------------
-dnl If we got --enable-embedded then adjust the Qt library name.
-dnl ------------------------------------------------------------
-- if test "x$kde_use_qt_emb" = "xyes"; then
-- qtlib="qte"
-- else
-- qtlib="qt"
-- fi
--
-- kde_int_qt="-l$qtlib"
+-if test "x$kde_use_qt_emb" = "xyes"; then
+- qtlib="qte"
-else
-- kde_int_qt="$LIBQT"
-- kde_lib_qt_set=yes
+- qtlib="qt"
-fi
-
+-kde_int_qt="-l$qtlib"
+-
-if test -z "$LIBQPE"; then
-dnl ------------------------------------------------------------
-dnl If we got --enable-palmtop then add -lqpe to the link line
@@ -2855,13 +2889,8 @@
-dnl ------------------------------------------------------------------------
-
-if test "x$kde_use_qt_mt" = "xyes"; then
-- if test -z "$LIBQT"; then
-- LIBQT="-l$qtlib-mt"
-- kde_int_qt="-l$qtlib-mt"
-- else
-- LIBQT="$qtlib-mt"
-- kde_int_qt="$qtlib-mt"
-- fi
+- LIBQT="-l$qtlib-mt"
+- kde_int_qt="-l$qtlib-mt"
- LIBQT_GLOB="lib$qtlib-mt.*"
- USING_QT_MT="using -mt"
-else
@@ -3116,7 +3145,15 @@
-
-AC_MSG_RESULT([$kde_cv_uic_plugins])
-if test "$kde_cv_uic_plugins" != yes; then
-- AC_MSG_ERROR([you need to install kdelibs first.])
+- AC_MSG_ERROR([
+-you need to install kdelibs first.
+-
+-If you did install kdelibs, then the Qt version that is picked up by
+-this configure is not the same version you used to compile kdelibs.
+-The Qt Plugin installed by kdelibs is *ONLY* loadable if its the
+-same Qt version, compiled with the same compiler and the same Qt
+-configuration settings.
+-])
-fi
-fi
-])
@@ -3528,6 +3565,11 @@
- AC_REQUIRE([K_PATH_X])
-
-if test $kde_qtver = 3; then
+- case $host in
+- *cygwin*) lib_kded="-lkdeinit_kded" ;;
+- *) lib_kded="" ;;
+- esac
+- AC_SUBST(LIB_KDED, $lib_kded)
- AC_SUBST(LIB_KDECORE, "-lkdecore")
- AC_SUBST(LIB_KDEUI, "-lkdeui")
- AC_SUBST(LIB_KIO, "-lkio")
@@ -3544,6 +3586,7 @@
- AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
- AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
- AC_SUBST(LIB_KDNSSD, "-lkdnssd")
+- AC_SUBST(LIB_KUNITTEST, "-lkunittest")
-# these are for backward compatibility
- AC_SUBST(LIB_KSYCOCA, "-lkio")
- AC_SUBST(LIB_KFILE, "-lkio")
@@ -4372,6 +4415,47 @@
- fi
-])
-
+-
+-AC_DEFUN([KDE_CHECK_FOR_BAD_COMPILER],
+-[
+- AC_MSG_CHECKING([whether $CC is blacklisted])
+-
+- dnl In theory we have tu run this test against $CC and $CXX
+- dnl in C and in C++ mode, because its perfectly legal for
+- dnl the user to mix compiler versions, since C has a defined
+- dnl ABI.
+- dnl
+- dnl For now, we assume the user is not on crack.
+-
+- AC_TRY_COMPILE([
+-#ifdef __GNUC__
+-#if __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0
+-choke me
+-#endif
+-#endif
+-], ,
+- kde_bad_compiler=no,
+- kde_bad_compiler=yes
+-)
+-
+- AC_MSG_RESULT($kde_bad_compiler)
+-
+-if test "$kde_bad_compiler" = "yes"; then
+- AC_MSG_ERROR([
+-
+-This particular compiler version is blacklisted because it
+-is known to miscompile KDE. Please use a newer version, or
+-if that is not yet available, choose an older version.
+-
+-Please do not report a bug or bother us reporting this
+-configure error. We know about it, and we introduced
+-it by intention to avoid untraceable bugs or crashes in KDE.
+-
+-])
+-fi
+-
+-])
+-
-dnl AC_VALIDIFY_CXXFLAGS checks for forbidden flags the user may have given
-AC_DEFUN([AC_VALIDIFY_CXXFLAGS],
-[dnl
@@ -4481,6 +4565,8 @@
-
- AC_PROG_CXX
-
+- KDE_CHECK_FOR_BAD_COMPILER
+-
- if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
- if test "$kde_use_debug_code" != "no"; then
- if test "$CXX" = "KCC"; then
@@ -4520,10 +4606,11 @@
-
- if test "$kde_use_warnings" = "yes"; then
- if test "$GCC" = "yes"; then
-- CXXFLAGS="-Wall -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
+- dnl ### FIXME: remove -Wno-non-virtual-dtor for KDE 4
+- CXXFLAGS="-Wall -W -Wpointer-arith -Wno-non-virtual-dtor $CXXFLAGS"
- case $host in
- *-*-linux-gnu)
-- CFLAGS="-ansi -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
+- CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
- CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
- KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"])
- KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"])
@@ -4576,8 +4663,8 @@
- fi
- rm -f conftest.h conftest.h.gch
- fi
-- AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes")
- fi
+- AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes")
- if test "$CXX" = "KCC"; then
- dnl unfortunately we currently cannot disable exception support in KCC
- dnl because doing so is binary incompatible and Qt by default links with exceptions :-(
@@ -4666,15 +4753,51 @@
- ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), [])
-])
-
+-AC_DEFUN([KDE_CHECK_VISIBILITY_GCC_BUG],
+- [
+- AC_CACHE_CHECK([for gcc -fvisibility-inlines-hidden bug], kde_cv_val_gcc_visibility_bug,
+- [
+- AC_LANG_SAVE
+- AC_LANG_CPLUSPLUS
+-
+- safe_CXXFLAGS=$CXXFLAGS
+- safe_LDFLAGS=$LDFLAGS
+- CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0"
+- LDFLAGS="$LDFLAGS -shared -fPIC"
+-
+- AC_TRY_LINK(
+- [
+- /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */
+- #include <string>
+- int some_function( void ) __attribute__ ((visibility("default")));
+- int some_function( void )
+- {
+- std::string s("blafasel");
+- return 0;
+- }
+- ], [/* elvis is alive */],
+- kde_cv_val_gcc_visibility_bug=no, kde_cv_val_gcc_visibility_bug=yes)
+-
+- CXXFLAGS=$safe_CXXFLAGS
+- LDFLAGS=$safe_LDFLAGS
+- AC_LANG_RESTORE
+- ]
+- )
+-
+- if test x$kde_cv_val_gcc_visibility_bug = xno; then
+- CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
+- fi
+- ]
+-)
+-
-AC_DEFUN([KDE_CHECK_AND_ADD_HIDDEN_VISIBILITY],
-[
- if test "$GXX" = "yes"; then
-- KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"])
-- KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"])
-- KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
- KDE_CHECK_COMPILER_FLAG(fvisibility=hidden,
- [
-- CXXFLAGS="$CXXFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
+- CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+- KDE_CHECK_VISIBILITY_GCC_BUG
+-
- HAVE_GCC_VISIBILITY=1
- AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
- ])
@@ -4713,6 +4836,10 @@
-KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
-AC_SUBST(KDE_PLUGIN)
-
+-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+-KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
+-AC_SUBST(KDE_CHECK_PLUGIN)
+-
-# we patch configure quite some so we better keep that consistent for incremental runs
-AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch configure')
-])
@@ -5237,11 +5364,13 @@
- [
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
-- ac_save_ldflags="$LDFLAGS"
-- ac_save_cxxflags="$CXXFLAGS"
-- LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries -lGL -lGLU"
-- test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LDFLAGS="$LDFLAGS -lX11"
-- LDFLAGS="$LDFLAGS $LIB_XEXT -lm $LIBSOCKET"
+- ac_save_ldflags=$LDFLAGS
+- ac_save_cxxflags=$CXXFLAGS
+- ac_save_libs=$LIBS
+- LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries"
+- LIBS="$LIBS -lGL -lGLU"
+- test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LIBS="$LIBS -lX11"
+- LIBS="$LIBS $LIB_XEXT -lm $LIBSOCKET"
- CXXFLAGS="$CFLAGS $X_INCLUDES"
- test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS"
- AC_TRY_LINK([#include <GL/gl.h>
@@ -5249,8 +5378,9 @@
-], [],
- ac_cv_have_gl="yes", ac_cv_have_gl="no")
- AC_LANG_RESTORE
-- LDFLAGS="$ac_save_ldflags"
-- CXXFLAGS="$ac_save_cxxflags"
+- LDFLAGS=$ac_save_ldflags
+- CXXFLAGS=$ac_save_cxxflags
+- LIBS=$ac_save_libs
- ])dnl
-
- if test "$ac_cv_have_gl" = "no"; then
@@ -6110,13 +6240,13 @@
-
-AC_DEFUN([KDE_CHECK_HEADER],
-[
-- AC_LANG_SAVE
- kde_safe_cppflags=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS $all_includes"
+- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- AC_CHECK_HEADER([$1], [$2], [$3], [$4])
+- AC_LANG_RESTORE
- CPPFLAGS=$kde_safe_cppflags
-- AC_LANG_RESTORE
-])
-
-AC_DEFUN([KDE_CHECK_HEADERS],
@@ -7133,6 +7263,49 @@
- PKG_CHECK_MODULES($1,$2,$3,$4)
-])
-
+-
+-dnl Check for PIE support in the compiler and linker
+-AC_DEFUN([KDE_CHECK_PIE_SUPPORT],
+-[
+- AC_CACHE_CHECK([for PIE support], kde_cv_val_pie_support,
+- [
+- AC_LANG_SAVE
+- AC_LANG_CPLUSPLUS
+- safe_CXXFLAGS=$CXXFLAGS
+- safe_LDFLAGS=$LDFLAGS
+- CXXFLAGS="$CXXFLAGS -fpie"
+- LDFLAGS="$LDFLAGS -pie"
+-
+- AC_TRY_LINK([int foo;], [], [kde_cv_val_pie_support=yes], [kde_cv_val_pie_support=no])
+-
+- CXXFLAGS=$safe_CXXFLAGS
+- LDFLAGS=$safe_LDFLAGS
+- ])
+-
+- AC_MSG_CHECKING(if enabling -pie/fpie support)
+-
+- AC_ARG_ENABLE(pie,
+- AS_HELP_STRING([--enable-pie],[platform supports PIE linking [default=detect]]),
+- [kde_has_pie_support=$enableval],
+- [kde_has_pie_support=detect])
+-
+- if test "$kde_has_pie_support" = "detect"; then
+- kde_has_pie_support=$kde_cv_val_pie_support
+- fi
+-
+- AC_MSG_RESULT([$kde_has_pie_support])
+-
+- KDE_USE_FPIE=""
+- KDE_USE_PIE=""
+-
+- AC_SUBST([KDE_USE_FPIE])
+- AC_SUBST([KDE_USE_PIE])
+-
+- if test "$kde_has_pie_support" = "yes"; then
+- KDE_USE_FPIE="-fpie"
+- KDE_USE_PIE="-pie"
+- fi
+-])
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-
-# serial 47 AC_PROG_LIBTOOL
@@ -9673,14 +9846,14 @@
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- ;;
- 10.*)
-- allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
- fi
@@ -9996,14 +10169,14 @@
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- ;;
- 10.*)
-- allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
- fi
@@ -11043,7 +11216,7 @@
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-# Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
@@ -12439,14 +12612,14 @@
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- ;;
- 10.*)
-- allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
- fi
@@ -13402,7 +13575,7 @@
+# Call AM_AUTOMAKE_VERSION so it can be traced.
+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-+ [AM_AUTOMAKE_VERSION([1.9.5])])
++ [AM_AUTOMAKE_VERSION([1.9.6])])
-# AM_AUX_DIR_EXPAND
+# Figure out how to run the assembler. -*- Autoconf -*-
@@ -13450,7 +13623,7 @@
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
-@@ -11995,131 +97,55 @@
+@@ -12133,131 +97,55 @@
# absolute PATH. The drawback is that using absolute paths prevent a
# configured tree to be moved without reconfiguration.
@@ -13619,7 +13792,7 @@
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
-@@ -12128,7 +154,6 @@
+@@ -12266,7 +154,6 @@
# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
@@ -13627,7 +13800,7 @@
# _AM_DEPENDENCIES(NAME)
# ----------------------
# See how the compiler implements dependency checking.
-@@ -12187,7 +212,9 @@
+@@ -12325,7 +212,9 @@
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
@@ -13638,7 +13811,7 @@
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-@@ -12215,9 +242,14 @@
+@@ -12353,9 +242,14 @@
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
@@ -13656,7 +13829,7 @@
am_cv_$1_dependencies_compiler_type=$depmode
break
fi
-@@ -12251,8 +283,8 @@
+@@ -12389,8 +283,8 @@
# ------------
AC_DEFUN([AM_DEP_TRACK],
[AC_ARG_ENABLE(dependency-tracking,
@@ -13667,7 +13840,7 @@
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
-@@ -12261,110 +293,273 @@
+@@ -12399,110 +293,273 @@
AC_SUBST([AMDEPBACKSLASH])
])
@@ -14032,7 +14205,7 @@
# AM_MAKE_INCLUDE()
# -----------------
-@@ -12408,94 +603,311 @@
+@@ -12546,94 +603,311 @@
rm -f confinc confmf
])
@@ -14416,123 +14589,32 @@
+]) # _AM_PROG_TAR
+m4_include([acinclude.m4])
-diff -Nru gwenview-1.2.0.orig/configure gwenview-1.2.0/configure
---- gwenview-1.2.0.orig/configure 2005-04-03 13:18:36.000000000 +0000
-+++ gwenview-1.2.0/configure 2005-07-26 19:28:23.000000000 +0000
-@@ -1,9 +1,8 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.54.
-+# Generated by GNU Autoconf 2.59.
- #
--# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 2003 Free Software Foundation, Inc.
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
- ## --------------------- ##
-@@ -20,9 +19,10 @@
- elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
- set -o posix
- fi
-+DUALCASE=1; export DUALCASE # for MKS sh
+diff -Nru gwenview-1.3.0.orig/config.h.in gwenview-1.3.0/config.h.in
+--- gwenview-1.3.0.orig/config.h.in 2005-09-11 10:39:49.000000000 -0400
++++ gwenview-1.3.0/config.h.in 2005-09-12 08:42:05.000000000 -0400
+@@ -250,9 +250,6 @@
+ #endif
- # Support unset when possible.
--if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
- else
- as_unset=false
-@@ -36,9 +36,12 @@
- PS4='+ '
- # NLS nuisances.
--for as_var in LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES LC_TIME
-+for as_var in \
-+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+ LC_TELEPHONE LC_TIME
- do
-- if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
- $as_unset $as_var
-@@ -82,15 +85,15 @@
+-/* define to 1 if -fvisibility is supported */
+-#undef __KDE_HAVE_GCC_VISIBILITY
+-
- # The user is always right.
- if test "${PATH_SEPARATOR+set}" != set; then
-- echo "#! /bin/sh" >conftest.sh
-- echo "exit 0" >>conftest.sh
-- chmod +x conftest.sh
-- if (PATH="/nonexistent;."; conftest.sh) >/dev/null 2>&1; then
-+ echo "#! /bin/sh" >conf$$.sh
-+ echo "exit 0" >>conf$$.sh
-+ chmod +x conf$$.sh
-+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
-- rm -f conftest.sh
-+ rm -f conf$$.sh
- fi
-
-
-@@ -215,16 +218,17 @@
- if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
- else
-+ test -d ./-p && rmdir ./-p
- as_mkdir_p=false
- fi
-
- as_executable_p="test -f"
-
- # Sed expression to map a string onto a valid CPP name.
--as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
-+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
- # Sed expression to map a string onto a valid variable name.
--as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
-+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
- # IFS
-@@ -460,7 +464,7 @@
+ #if defined(__SVR4) && !defined(__svr4__)
+ #define __svr4__ 1
+diff -Nru gwenview-1.3.0.orig/configure gwenview-1.3.0/configure
+--- gwenview-1.3.0.orig/configure 2005-09-11 10:39:47.000000000 -0400
++++ gwenview-1.3.0/configure 2005-09-12 08:43:54.000000000 -0400
+@@ -464,7 +464,7 @@
# include <unistd.h>
#endif"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KSYCOCA LIB_KFILE LIB_KFM LIB_KIPI CCAS CCASFLAGS GV_ASM_DEFS TOPSUBDIRS desktopfiles_SUBDIR_included_TRUE desktopfiles_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE gvdirpart_SUBDIR_included_TRUE gvdirpart_SUBDIR_included_FALSE gvimagepart_SUBDIR_included_TRUE gvimagepart_SUBDIR_included_FALSE gvimageutils_SUBDIR_included_TRUE gvimageutils_SUBDIR_included_FALSE gwenviewapp_SUBDIR_included_TRUE gwenviewapp_SUBDIR_included_FALSE libgvcompat_SUBDIR_included_TRUE libgvcompat_SUBDIR_included_FALSE libgvexif_SUBDIR_included_TRUE libgvexif_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE po_SUBDIR_included_TRUE po_SUBDIR_included_FALSE src_SUBDIR_included_TRUE src_SUBDIR_included_FALSE tools_SUBDIR_included_TRUE tools_SUBDIR_included_FALSE tsthread_SUBDIR_included_TRUE tsthread_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KSYCOCA LIB_KFILE LIB_KFM LIB_KIPI CCAS CCASFLAGS GV_ASM_DEFS TOPSUBDIRS LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM LIB_ARTS QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN GV_LIB_KIPI CCAS CCASFLAGS GV_ASM_DEFS LIBMNG PKG_CONFIG LIBEXIF_CFLAGS LIBEXIF_LIBS libexif_internal_TRUE libexif_internal_FALSE TOPSUBDIRS doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE src_SUBDIR_included_TRUE src_SUBDIR_included_FALSE translations_SUBDIR_included_TRUE translations_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM LIB_ARTS QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN GV_LIB_KIPI CCAS CCASFLAGS GV_ASM_DEFS LIBMNG PKG_CONFIG LIBEXIF_CFLAGS LIBEXIF_LIBS libexif_internal_TRUE libexif_internal_FALSE TOPSUBDIRS doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE src_SUBDIR_included_TRUE src_SUBDIR_included_FALSE translations_SUBDIR_included_TRUE translations_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
-@@ -819,7 +823,7 @@
-
- # Be sure to have absolute paths.
- for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-- localstatedir libdir includedir oldincludedir infodir mandir
-+ localstatedir libdir includedir oldincludedir infodir mandir
- do
- eval ac_val=$`echo $ac_var`
- case $ac_val in
-@@ -859,10 +863,10 @@
- # Try the directory containing this script, then its parent.
- ac_confdir=`(dirname "$0") 2>/dev/null ||
- $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$0" : 'X\(//\)[^/]' \| \
-- X"$0" : 'X\(//\)$' \| \
-- X"$0" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$0" : 'X\(//\)[^/]' \| \
-+ X"$0" : 'X\(//\)$' \| \
-+ X"$0" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
- echo X"$0" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -941,6 +945,14 @@
+@@ -945,6 +945,14 @@
ac_env_FFLAGS_value=$FFLAGS
ac_cv_env_FFLAGS_set=${FFLAGS+set}
ac_cv_env_FFLAGS_value=$FFLAGS
@@ -14547,19 +14629,7 @@
#
# Report the --help message.
-@@ -974,9 +986,9 @@
- cat <<_ACEOF
- Installation directories:
- --prefix=PREFIX install architecture-independent files in PREFIX
-- [$ac_default_prefix]
-+ [$ac_default_prefix]
- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
-- [PREFIX]
-+ [PREFIX]
-
- By default, \`make install' will install all the files in
- \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
-@@ -1021,6 +1033,8 @@
+@@ -1025,6 +1033,8 @@
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
@@ -14568,7 +14638,7 @@
--disable-fast-perl disable fast Makefile generation (needs perl)
--enable-debug=ARG enables debug symbols (yes|no|full) default=no
--disable-debug disables debug output and debug symbols default=no
-@@ -1028,8 +1042,8 @@
+@@ -1032,8 +1042,8 @@
work!)
--disable-warnings disables compilation with -Wall and similar
--enable-profile creates profiling infos default=no
@@ -14579,7 +14649,7 @@
--enable-pch enables precompiled header support (currently only
KCC or gcc >=3.4+unsermake) default=no
--enable-coverage use gcc coverage testing
-@@ -1084,6 +1098,8 @@
+@@ -1089,6 +1099,8 @@
CXXCPP C++ preprocessor
F77 Fortran 77 compiler command
FFLAGS Fortran 77 compiler flags
@@ -14588,223 +14658,7 @@
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-@@ -1121,12 +1137,45 @@
- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_builddir$srcdir ;;
- esac
--# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
--# absolute.
--ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
--ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
--ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
--ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
-+
-+# Do not use `cd foo && pwd` to compute absolute paths, because
-+# the directories may not exist.
-+case `pwd` in
-+.) ac_abs_builddir="$ac_dir";;
-+*)
-+ case "$ac_dir" in
-+ .) ac_abs_builddir=`pwd`;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_builddir=${ac_top_builddir}.;;
-+*)
-+ case ${ac_top_builddir}. in
-+ .) ac_abs_top_builddir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_srcdir=$ac_srcdir;;
-+*)
-+ case $ac_srcdir in
-+ .) ac_abs_srcdir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_srcdir=$ac_top_srcdir;;
-+*)
-+ case $ac_top_srcdir in
-+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-+ esac;;
-+esac
-
- cd $ac_dir
- # Check for guested configure; otherwise get Cygnus style configure.
-@@ -1137,13 +1186,13 @@
- echo
- $SHELL $ac_srcdir/configure --help=recursive
- elif test -f $ac_srcdir/configure.ac ||
-- test -f $ac_srcdir/configure.in; then
-+ test -f $ac_srcdir/configure.in; then
- echo
- $ac_configure --help
- else
- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
- fi
-- cd $ac_popdir
-+ cd "$ac_popdir"
- done
- fi
-
-@@ -1151,8 +1200,7 @@
- if $ac_init_version; then
- cat <<\_ACEOF
-
--Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
--Free Software Foundation, Inc.
-+Copyright (C) 2003 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
-@@ -1164,7 +1212,7 @@
- running configure, to aid debugging if configure makes a mistake.
-
- It was created by $as_me, which was
--generated by GNU Autoconf 2.54. Invocation command line was
-+generated by GNU Autoconf 2.59. Invocation command line was
-
- $ $0 $@
-
-@@ -1216,24 +1264,54 @@
-
- # Keep a trace of the command line.
- # Strip out --no-create and --no-recursion so they do not pile up.
-+# Strip out --silent because we don't want to record it for future runs.
- # Also quote any args containing shell meta-characters.
-+# Make two passes to allow for proper duplicate-argument suppression.
- ac_configure_args=
-+ac_configure_args0=
-+ac_configure_args1=
- ac_sep=
--for ac_arg
-+ac_must_keep_next=false
-+for ac_pass in 1 2
- do
-- case $ac_arg in
-- -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-- | --no-cr | --no-c | -n ) continue ;;
-- -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-- continue ;;
-- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-- esac
-- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-- # Get rid of the leading space.
-- ac_sep=" "
-+ for ac_arg
-+ do
-+ case $ac_arg in
-+ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+ | -silent | --silent | --silen | --sile | --sil)
-+ continue ;;
-+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-+ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+ esac
-+ case $ac_pass in
-+ 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-+ 2)
-+ ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-+ if test $ac_must_keep_next = true; then
-+ ac_must_keep_next=false # Got value, back to normal.
-+ else
-+ case $ac_arg in
-+ *=* | --config-cache | -C | -disable-* | --disable-* \
-+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-+ | -with-* | --with-* | -without-* | --without-* | --x)
-+ case "$ac_configure_args0 " in
-+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-+ esac
-+ ;;
-+ -* ) ac_must_keep_next=true ;;
-+ esac
-+ fi
-+ ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-+ # Get rid of the leading space.
-+ ac_sep=" "
-+ ;;
-+ esac
-+ done
- done
-+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
- # When interrupted or exit'd, cleanup temporary files, and complete
- # config.log. We remove comments because anyway the quotes in there
-@@ -1257,12 +1335,12 @@
- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
- *ac_space=\ *)
- sed -n \
-- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-+ "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
- ;;
- *)
- sed -n \
-- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
- ;;
- esac;
- }
-@@ -1291,7 +1369,7 @@
- for ac_var in $ac_subst_files
- do
- eval ac_val=$`echo $ac_var`
-- echo "$ac_var='"'"'$ac_val'"'"'"
-+ echo "$ac_var='"'"'$ac_val'"'"'"
- done | sort
- echo
- fi
-@@ -1310,7 +1388,7 @@
- echo "$as_me: caught signal $ac_signal"
- echo "$as_me: exit $exit_status"
- } >&5
-- rm -f core core.* *.core &&
-+ rm -f core *.core &&
- rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
- exit $exit_status
- ' 0
-@@ -1390,7 +1468,7 @@
- # value.
- ac_cache_corrupted=false
- for ac_var in `(set) 2>&1 |
-- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-+ sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
- eval ac_old_set=\$ac_cv_env_${ac_var}_set
- eval ac_new_set=\$ac_env_${ac_var}_set
- eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-@@ -1407,13 +1485,13 @@
- ,);;
- *)
- if test "x$ac_old_val" != "x$ac_new_val"; then
-- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-+ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
- echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
-+ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
- echo "$as_me: former value: $ac_old_val" >&2;}
-- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
-+ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
- echo "$as_me: current value: $ac_new_val" >&2;}
-- ac_cache_corrupted=:
-+ ac_cache_corrupted=:
- fi;;
- esac
- # Pass precious variables to config.status.
-@@ -1585,7 +1663,7 @@
+@@ -1652,7 +1664,7 @@
rm conftest.sed
@@ -14813,58 +14667,7 @@
test -n "$INSTALL" && kde_save_INSTALL_given=$INSTALL
-@@ -1602,6 +1680,7 @@
- # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
- # AFS /usr/afsws/bin/install, which mishandles nonexistent args
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-+# OS/2's system install, which has a completely different semantic
- # ./install, which can be erroneously created by make from ./install.sh.
- echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
- echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
-@@ -1618,6 +1697,7 @@
- case $as_dir/ in
- ./ | .// | /cC/* | \
- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-+ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
- /usr/ucb/* ) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -1625,20 +1705,20 @@
- # by default.
- for ac_prog in ginstall scoinst install; do
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-- if test $ac_prog = install &&
-- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-- # AIX install. It has an incompatible calling convention.
-- :
-- elif test $ac_prog = install &&
-- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-- # program-specific install script used by HP pwplus--don't use.
-- :
-- else
-- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-- break 3
-- fi
-- fi
-+ if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-+ if test $ac_prog = install &&
-+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-+ # AIX install. It has an incompatible calling convention.
-+ :
-+ elif test $ac_prog = install &&
-+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-+ # program-specific install script used by HP pwplus--don't use.
-+ :
-+ else
-+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-+ break 3
-+ fi
-+ fi
- done
- done
- ;;
-@@ -1741,7 +1821,6 @@
+@@ -1810,7 +1822,6 @@
fi
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
@@ -14872,7 +14675,7 @@
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
-@@ -1755,6 +1834,39 @@
+@@ -1824,6 +1835,39 @@
echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
@@ -14912,27 +14715,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.
-@@ -1795,15 +1907,15 @@
- test -n "$AWK" && break
- done
-
--echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \${MAKE}" >&5
--echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
--set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
-+echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
- if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.make <<\_ACEOF
- all:
-- @echo 'ac_maketemp="${MAKE}"'
-+ @echo 'ac_maketemp="$(MAKE)"'
- _ACEOF
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
- eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
-@@ -1833,7 +1945,7 @@
+@@ -1902,7 +1946,7 @@
fi
rmdir .tst 2>/dev/null
@@ -14941,7 +14724,7 @@
if test "`cd $srcdir && pwd`" != "`pwd`" &&
test -f $srcdir/config.status; then
{ { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-@@ -1881,9 +1993,6 @@
+@@ -1950,9 +1994,6 @@
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
@@ -14951,7 +14734,7 @@
install_sh=${install_sh-"$am_aux_dir/install-sh"}
# Installed binaries are usually stripped using `strip' when the user
-@@ -1976,6 +2085,38 @@
+@@ -2045,6 +2086,38 @@
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
@@ -14990,489 +14773,7 @@
-@@ -2653,8 +2794,10 @@
- fi
-
-
--test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5
--echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;}
-+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
-
- # Provide some information about the compiler.
-@@ -2678,8 +2821,11 @@
- (exit $ac_status); }
-
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -2690,12 +2836,12 @@
- }
- _ACEOF
- ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.exe"
-+ac_clean_files="$ac_clean_files a.out a.exe b.out"
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--echo "$as_me:$LINENO: checking for C compiler default output" >&5
--echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
- ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
- if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
- (eval $ac_link_default) 2>&5
-@@ -2709,27 +2855,39 @@
- # Be careful to initialize this variable, since it used to be cached.
- # Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
- ac_cv_exeext=
--for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.*; do
-+# b.out is created by i960 compilers.
-+for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
-+do
- test -f "$ac_file" || continue
- case $ac_file in
-- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
-- a.out ) # We found the default executable, but exeext='' is most
-- # certainly right.
-- break;;
-- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-- # FIXME: I believe we export ac_cv_exeext for Libtool --akim.
-- export ac_cv_exeext
-- break;;
-- * ) break;;
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-+ ;;
-+ conftest.$ac_ext )
-+ # This is the source file.
-+ ;;
-+ [ab].out )
-+ # We found the default executable, but exeext='' is most
-+ # certainly right.
-+ break;;
-+ *.* )
-+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+ # FIXME: I believe we export ac_cv_exeext for Libtool,
-+ # but it would be cool to find out if it's true. Does anybody
-+ # maintain Libtool? --akim.
-+ export ac_cv_exeext
-+ break;;
-+ * )
-+ break;;
- esac
- done
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- { { echo "$as_me:$LINENO: error: C compiler cannot create executables
--check \`config.log' for details." >&5
-+See \`config.log' for more details." >&5
- echo "$as_me: error: C compiler cannot create executables
--check \`config.log' for details." >&2;}
-+See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }
- fi
-
-@@ -2756,9 +2914,11 @@
- cross_compiling=yes
- else
- { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
--If you meant to cross compile, use \`--host'." >&5
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run C compiled programs.
--If you meant to cross compile, use \`--host'." >&2;}
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- fi
- fi
-@@ -2766,7 +2926,7 @@
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-
--rm -f a.out a.exe conftest$ac_cv_exeext
-+rm -f a.out a.exe conftest$ac_cv_exeext b.out
- ac_clean_files=$ac_clean_files_save
- # Check the compiler produces executables we can run. If not, either
- # the compiler is broken, or we cross compile.
-@@ -2791,14 +2951,16 @@
- case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-- export ac_cv_exeext
-- break;;
-+ export ac_cv_exeext
-+ break;;
- * ) break;;
- esac
- done
- else
-- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link" >&5
--echo "$as_me: error: cannot compute suffix of executables: cannot compile and link" >&2;}
-+ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-@@ -2815,8 +2977,11 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -2841,9 +3006,12 @@
- done
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile" >&5
--echo "$as_me: error: cannot compute suffix of object files: cannot compile" >&2;}
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-@@ -2859,8 +3027,11 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -2875,11 +3046,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -2888,10 +3068,11 @@
- ac_compiler_gnu=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_compiler_gnu=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
- fi
-@@ -2907,8 +3088,11 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -2920,11 +3104,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -2933,10 +3126,11 @@
- ac_cv_prog_cc_g=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_prog_cc_g=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
- echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-@@ -2963,8 +3157,11 @@
- ac_cv_prog_cc_stdc=no
- ac_save_CC=$CC
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <stdarg.h>
- #include <stdio.h>
- #include <sys/types.h>
-@@ -2987,6 +3184,16 @@
- va_end (v);
- return s;
- }
-+
-+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
-+ function prototypes and stuff, but not '\xHH' hex character constants.
-+ These don't provoke an error unfortunately, instead are silently treated
-+ as 'x'. The following induces an error, until -std1 is added to get
-+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
-+ array size at least. It's necessary to write '\x00'==0 to get something
-+ that's true only with -std1. */
-+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-+
- int test (int i, double x);
- struct s1 {int (*f) (int a);};
- struct s2 {int (*f) (double a);};
-@@ -3013,11 +3220,20 @@
- CC="$ac_save_CC $ac_arg"
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3027,9 +3243,10 @@
- break
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext
-+rm -f conftest.err conftest.$ac_objext
- done
- rm -f conftest.$ac_ext conftest.$ac_objext
- CC=$ac_save_CC
-@@ -3057,19 +3274,27 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- for ac_declaration in \
-- ''\
-- '#include <stdlib.h>' \
-+ '' \
- 'extern "C" void std::exit (int) throw (); using std::exit;' \
- 'extern "C" void std::exit (int); using std::exit;' \
- 'extern "C" void exit (int) throw ();' \
-@@ -3077,10 +3302,13 @@
- 'void exit (int);'
- do
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
--#include <stdlib.h>
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_declaration
-+#include <stdlib.h>
- int
- main ()
- {
-@@ -3091,11 +3319,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3104,13 +3341,17 @@
- :
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- continue
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_declaration
- int
- main ()
-@@ -3122,11 +3363,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3135,9 +3385,10 @@
- break
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- rm -f conftest*
- if test -n "$ac_declaration"; then
-@@ -3148,9 +3399,10 @@
-
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3198,7 +3450,9 @@
+@@ -3378,7 +3451,9 @@
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
@@ -15483,7 +14784,7 @@
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-@@ -3226,9 +3480,14 @@
+@@ -3406,9 +3481,14 @@
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
@@ -15501,384 +14802,7 @@
am_cv_CC_dependencies_compiler_type=$depmode
break
fi
-@@ -3283,13 +3542,22 @@
- do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
-+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
--#include <assert.h>
-- Syntax error
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+ Syntax error
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -3301,6 +3569,7 @@
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-@@ -3311,7 +3580,8 @@
- :
- else
- echo "$as_me: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- # Broken: fails on valid input.
- continue
- fi
-@@ -3320,8 +3590,11 @@
- # OK, works on sane cases. Now check whether non-existent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <ac_nonexistent.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-@@ -3334,6 +3607,7 @@
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-@@ -3345,7 +3619,8 @@
- continue
- else
- echo "$as_me: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- # Passes both tests.
- ac_preproc_ok=:
- break
-@@ -3374,13 +3649,22 @@
- do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
-+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
--#include <assert.h>
-- Syntax error
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+ Syntax error
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -3392,6 +3676,7 @@
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-@@ -3402,7 +3687,8 @@
- :
- else
- echo "$as_me: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- # Broken: fails on valid input.
- continue
- fi
-@@ -3411,8 +3697,11 @@
- # OK, works on sane cases. Now check whether non-existent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <ac_nonexistent.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-@@ -3425,6 +3714,7 @@
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-@@ -3436,7 +3726,8 @@
- continue
- else
- echo "$as_me: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- # Passes both tests.
- ac_preproc_ok=:
- break
-@@ -3449,8 +3740,10 @@
- if $ac_preproc_ok; then
- :
- else
-- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check" >&5
--echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
-+ { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-@@ -3608,8 +3901,11 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -3624,11 +3920,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3637,10 +3942,11 @@
- ac_compiler_gnu=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_compiler_gnu=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
- fi
-@@ -3656,8 +3962,11 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -3669,11 +3978,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3682,10 +4000,11 @@
- ac_cv_prog_cxx_g=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_prog_cxx_g=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
- echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
-@@ -3705,8 +4024,7 @@
- fi
- fi
- for ac_declaration in \
-- ''\
-- '#include <stdlib.h>' \
-+ '' \
- 'extern "C" void std::exit (int) throw (); using std::exit;' \
- 'extern "C" void std::exit (int); using std::exit;' \
- 'extern "C" void exit (int) throw ();' \
-@@ -3714,10 +4032,13 @@
- 'void exit (int);'
- do
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
--#include <stdlib.h>
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_declaration
-+#include <stdlib.h>
- int
- main ()
- {
-@@ -3728,11 +4049,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3741,13 +4071,17 @@
- :
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- continue
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_declaration
- int
- main ()
-@@ -3759,11 +4093,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3772,9 +4115,10 @@
- break
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- rm -f conftest*
- if test -n "$ac_declaration"; then
-@@ -3830,7 +4174,9 @@
+@@ -4095,7 +4175,9 @@
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
@@ -15889,7 +14813,7 @@
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-@@ -3858,9 +4204,14 @@
+@@ -4123,9 +4205,14 @@
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
@@ -15907,1273 +14831,22 @@
am_cv_CXX_dependencies_compiler_type=$depmode
break
fi
-@@ -3927,8 +4278,11 @@
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -fno-builtin"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -3940,11 +4294,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3953,9 +4316,11 @@
- eval "kde_cv_prog_cxx_$kde_cache=yes"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -4001,8 +4366,11 @@
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -Woverloaded-virtual"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -4014,11 +4382,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4027,9 +4404,11 @@
- eval "kde_cv_prog_cxx_$kde_cache=yes"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -4089,8 +4468,11 @@
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -pg"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -4102,11 +4484,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4115,9 +4506,11 @@
- eval "kde_cv_prog_cxx_$kde_cache=yes"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -4174,8 +4567,11 @@
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -Wmissing-format-attribute"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -4187,11 +4583,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4200,9 +4605,11 @@
- eval "kde_cv_prog_cxx_$kde_cache=yes"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -4244,8 +4651,11 @@
- save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -Wmissing-format-attribute"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -4257,22 +4667,33 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- eval "kde_cv_prog_cc_$kde_cache=yes"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- CFLAGS="$save_CFLAGS"
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -4319,8 +4740,11 @@
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -Wundef"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -4332,11 +4756,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4345,9 +4778,11 @@
- eval "kde_cv_prog_cxx_$kde_cache=yes"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -4392,8 +4827,11 @@
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -Wno-long-long"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -4405,11 +4843,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4418,9 +4865,11 @@
- eval "kde_cv_prog_cxx_$kde_cache=yes"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -4465,8 +4914,11 @@
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -Wnon-virtual-dtor"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -4478,11 +4930,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4491,9 +4952,11 @@
- eval "kde_cv_prog_cxx_$kde_cache=yes"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -4557,8 +5020,11 @@
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -fno-exceptions"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -4570,11 +5036,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4583,9 +5058,11 @@
- eval "kde_cv_prog_cxx_$kde_cache=yes"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -4630,8 +5107,11 @@
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -fno-check-new"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -4643,11 +5123,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4656,9 +5145,11 @@
- eval "kde_cv_prog_cxx_$kde_cache=yes"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -4703,8 +5194,11 @@
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -fno-common"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -4716,11 +5210,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4729,9 +5232,11 @@
- eval "kde_cv_prog_cxx_$kde_cache=yes"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -4776,8 +5281,11 @@
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -fexceptions"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -4789,11 +5297,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4802,9 +5319,11 @@
- eval "kde_cv_prog_cxx_$kde_cache=yes"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -4893,8 +5412,11 @@
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS --pch"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -4906,11 +5428,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4919,9 +5450,11 @@
- eval "kde_cv_prog_cxx_$kde_cache=yes"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -4967,8 +5500,11 @@
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS --inline_keyword_space_time=6"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -4980,11 +5516,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4993,9 +5538,11 @@
- eval "kde_cv_prog_cxx_$kde_cache=yes"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -5040,8 +5587,11 @@
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS --inline_auto_space_time=2"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -5053,11 +5603,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -5066,9 +5625,11 @@
- eval "kde_cv_prog_cxx_$kde_cache=yes"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -5113,8 +5674,11 @@
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS --inline_implicit_space_time=2.0"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -5126,11 +5690,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -5139,9 +5712,11 @@
- eval "kde_cv_prog_cxx_$kde_cache=yes"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -5186,8 +5761,11 @@
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS --inline_generated_space_time=2.0"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -5199,11 +5777,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -5212,9 +5799,11 @@
- eval "kde_cv_prog_cxx_$kde_cache=yes"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -5259,8 +5848,11 @@
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS --one_per"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -5272,11 +5864,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -5285,9 +5886,11 @@
- eval "kde_cv_prog_cxx_$kde_cache=yes"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -5431,13 +6034,22 @@
- do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
-+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
--#include <assert.h>
-- Syntax error
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+ Syntax error
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -5449,6 +6061,7 @@
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_cxx_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
- else
- ac_cpp_err=
- fi
-@@ -5459,7 +6072,8 @@
- :
- else
- echo "$as_me: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- # Broken: fails on valid input.
- continue
- fi
-@@ -5468,8 +6082,11 @@
- # OK, works on sane cases. Now check whether non-existent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <ac_nonexistent.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-@@ -5482,6 +6099,7 @@
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_cxx_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
- else
- ac_cpp_err=
- fi
-@@ -5493,7 +6111,8 @@
- continue
- else
- echo "$as_me: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- # Passes both tests.
- ac_preproc_ok=:
- break
-@@ -5522,13 +6141,22 @@
- do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
-+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
--#include <assert.h>
-- Syntax error
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+ Syntax error
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -5540,6 +6168,7 @@
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_cxx_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
- else
- ac_cpp_err=
- fi
-@@ -5550,7 +6179,8 @@
- :
- else
- echo "$as_me: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- # Broken: fails on valid input.
- continue
- fi
-@@ -5559,8 +6189,11 @@
- # OK, works on sane cases. Now check whether non-existent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <ac_nonexistent.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-@@ -5573,6 +6206,7 @@
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_cxx_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
- else
- ac_cpp_err=
- fi
-@@ -5584,7 +6218,8 @@
- continue
- else
- echo "$as_me: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- # Passes both tests.
- ac_preproc_ok=:
- break
-@@ -5597,8 +6232,10 @@
- if $ac_preproc_ok; then
- :
- else
-- { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
--echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
-+ { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-+See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-@@ -5634,8 +6271,11 @@
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -O0"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -5647,11 +6287,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -5660,9 +6309,11 @@
- eval "kde_cv_prog_cxx_$kde_cache=yes"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -5746,8 +6397,11 @@
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -Wl,--enable-new-dtags"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -5759,11 +6413,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -5772,9 +6435,11 @@
- eval "kde_cv_prog_cxx_$kde_cache=yes"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -5820,8 +6485,11 @@
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -Wl,--as-needed"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -5833,11 +6501,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -5846,9 +6523,11 @@
- eval "kde_cv_prog_cxx_$kde_cache=yes"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -5912,176 +6591,27 @@
+@@ -6593,183 +6680,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
- case $host in
- *-*-linux-gnu)
-+ fi
-
+-
-echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--no-undefined" >&5
-echo $ECHO_N "checking whether $CXX supports -Wl,--no-undefined... $ECHO_C" >&6
-kde_cache=`echo Wl,--no-undefined | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-+
-+
-+
-+
-+ # Check whether --enable-nmcheck or --disable-nmcheck was given.
-+if test "${enable_nmcheck+set}" = set; then
-+ enableval="$enable_nmcheck"
-+ kde_use_nmcheck=$enableval
- else
-+ kde_use_nmcheck=no
-+fi;
-
+-else
-
-
+-
- ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -17186,8 +14859,11 @@
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -Wl,--no-undefined"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
-
-int
-main ()
@@ -17199,22 +14875,33 @@
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
+- (eval $ac_link) 2>conftest.er1
- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- eval "kde_cv_prog_cxx_$kde_cache=yes"
-else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
-fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
@@ -17251,8 +14938,11 @@
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -Wl,--allow-shlib-undefined"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
-
-int
-main ()
@@ -17264,22 +14954,33 @@
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
+- (eval $ac_link) 2>conftest.er1
- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- eval "kde_cv_prog_cxx_$kde_cache=yes"
-else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
-fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
@@ -17311,38 +15012,10 @@
-
- ;;
- esac
-- fi
--
--
--
--
--
-- # Check whether --enable-nmcheck or --disable-nmcheck was given.
--if test "${enable_nmcheck+set}" = set; then
-- enableval="$enable_nmcheck"
-- kde_use_nmcheck=$enableval
--else
-- kde_use_nmcheck=no
--fi;
--
-- if test "$kde_use_nmcheck" = "yes"; then
-- KDE_USE_NMCHECK_TRUE=""
-- KDE_USE_NMCHECK_FALSE="#"
-- else
-- KDE_USE_NMCHECK_TRUE="#"
-- KDE_USE_NMCHECK_FALSE=""
-- fi
-+ if test "$kde_use_nmcheck" = "yes"; then
-+ KDE_USE_NMCHECK_TRUE=""
-+ KDE_USE_NMCHECK_FALSE="#"
-+ else
-+ KDE_USE_NMCHECK_TRUE="#"
-+ KDE_USE_NMCHECK_FALSE=""
-+ fi
+ fi
-
-@@ -6249,10 +6779,10 @@
+@@ -6958,10 +6868,10 @@
fi
done
done
@@ -17354,7 +15027,7 @@
echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6
-@@ -6486,31 +7016,23 @@
+@@ -7195,31 +7105,23 @@
;;
cygwin*)
@@ -17394,7 +15067,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -6549,42 +7071,21 @@
+@@ -7258,42 +7160,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -17444,7 +15117,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -6613,9 +7114,6 @@
+@@ -7322,9 +7203,6 @@
;;
osf3* | osf4* | osf5*)
@@ -17454,7 +15127,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -6625,7 +7123,6 @@
+@@ -7334,7 +7212,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -17462,16 +15135,16 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -6702,7 +7199,7 @@
+@@ -7411,7 +7288,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 6705 "configure"' > conftest.$ac_ext
-+ echo '#line 7202 "configure"' > conftest.$ac_ext
+- echo '#line 7414 "configure"' > conftest.$ac_ext
++ echo '#line 7291 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -6747,12 +7244,11 @@
+@@ -7456,12 +7333,11 @@
(exit $ac_status); }; then
case "`/usr/bin/file conftest.o`" in
*32-bit*)
@@ -17485,7 +15158,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -6764,7 +7260,6 @@
+@@ -7473,7 +7349,6 @@
esac
;;
*64-bit*)
@@ -17493,541 +15166,16 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -6801,8 +7296,11 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -8052,7 +7927,7 @@
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- int
- main ()
-@@ -6814,11 +7312,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -6827,10 +7334,12 @@
- lt_cv_cc_needs_belf=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- lt_cv_cc_needs_belf=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -6858,44 +7367,62 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <stdlib.h>
- #include <stdarg.h>
- #include <string.h>
- #include <float.h>
-
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_header_stdc=yes
- else
- echo "$as_me: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- ac_cv_header_stdc=no
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_header_stdc=no
- fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
- if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <string.h>
-
- _ACEOF
-@@ -6912,8 +7439,11 @@
- if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <stdlib.h>
-
- _ACEOF
-@@ -6933,16 +7463,20 @@
- :
- else
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <ctype.h>
- #if ((' ' & 0x0FF) == 0x020)
- # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
- # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
- #else
--# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \
-- || ('j' <= (c) && (c) <= 'r') \
-- || ('s' <= (c) && (c) <= 'z'))
-+# define ISLOWER(c) \
-+ (('a' <= (c) && (c) <= 'i') \
-+ || ('j' <= (c) && (c) <= 'r') \
-+ || ('s' <= (c) && (c) <= 'z'))
- # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
- #endif
-
-@@ -6953,7 +7487,7 @@
- int i;
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
-- || toupper (i) != TOUPPER (i))
-+ || toupper (i) != TOUPPER (i))
- exit(2);
- exit (0);
- }
-@@ -6973,11 +7507,12 @@
- else
- echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ( exit $ac_status )
- ac_cv_header_stdc=no
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
- fi
-@@ -7002,7 +7537,7 @@
-
-
- for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-- inttypes.h stdint.h unistd.h
-+ inttypes.h stdint.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-@@ -7011,19 +7546,31 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
-
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -7032,10 +7579,11 @@
- eval "$as_ac_Header=yes"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- eval "$as_ac_Header=no"
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-@@ -7066,18 +7614,30 @@
- echo "$as_me:$LINENO: checking $ac_header usability" >&5
- echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -7086,10 +7646,11 @@
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6
-
-@@ -7097,8 +7658,11 @@
- echo "$as_me:$LINENO: checking $ac_header presence" >&5
- echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-@@ -7111,6 +7675,7 @@
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-@@ -7121,7 +7686,8 @@
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_header_preproc=no
- fi
- rm -f conftest.err conftest.$ac_ext
-@@ -7129,26 +7695,43 @@
- echo "${ECHO_T}$ac_header_preproc" >&6
-
- # So? What about this header?
--case $ac_header_compiler:$ac_header_preproc in
-- yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-- no:yes )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
- echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists. ##
-+## ------------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
- esac
- echo "$as_me:$LINENO: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- eval "$as_ac_Header=$ac_header_preproc"
-+ eval "$as_ac_Header=\$ac_header_preproc"
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-@@ -7168,7 +7751,7 @@
- ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_f77_compiler_gnu
- if test -n "$ac_tool_prefix"; then
-- for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95
-+ for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-@@ -7210,7 +7793,7 @@
- fi
- if test -z "$F77"; then
- ac_ct_F77=$F77
-- for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95
-+ for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
-@@ -7255,7 +7838,7 @@
-
-
# Provide some information about the compiler.
--echo "$as_me:7258:" \
-+echo "$as_me:7841:" \
+-echo "$as_me:8055:" \
++echo "$as_me:7930:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-@@ -7273,9 +7856,10 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-+rm -f a.out
-
- # If we don't use `.F' as extension, the preprocessor is not run on the
--# input file.
-+# input file. (Note that this only needs to work for GNU compilers.)
- ac_save_ext=$ac_ext
- ac_ext=F
- echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
-@@ -7293,11 +7877,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -7306,17 +7899,17 @@
- ac_compiler_gnu=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_compiler_gnu=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_f77_compiler_gnu=$ac_compiler_gnu
-
- fi
- echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
- echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
- ac_ext=$ac_save_ext
--G77=`test $ac_compiler_gnu = yes && echo yes`
- ac_test_FFLAGS=${FFLAGS+set}
- ac_save_FFLAGS=$FFLAGS
- FFLAGS=
-@@ -7333,11 +7926,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -7346,10 +7948,11 @@
- ac_cv_prog_f77_g=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_prog_f77_g=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
- fi
- echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
-@@ -7357,18 +7960,20 @@
- if test "$ac_test_FFLAGS" = set; then
- FFLAGS=$ac_save_FFLAGS
- elif test $ac_cv_prog_f77_g = yes; then
-- if test "$G77" = yes; then
-+ if test "x$ac_cv_f77_compiler_gnu" = xyes; then
- FFLAGS="-g -O2"
- else
- FFLAGS="-g"
- fi
- else
-- if test "$G77" = yes; then
-+ if test "x$ac_cv_f77_compiler_gnu" = xyes; then
- FFLAGS="-O2"
- else
- FFLAGS=
- fi
- fi
-+
-+G77=`test $ac_compiler_gnu = yes && echo yes`
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -7386,7 +7991,7 @@
+@@ -8205,7 +8080,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
i=0
@@ -18036,7 +15184,7 @@
case $build_os in
msdosdjgpp*)
-@@ -7415,20 +8020,26 @@
+@@ -8234,20 +8109,26 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -18068,7 +15216,7 @@
# Add a significant safety factor because C++ compilers can tack on massive
# amounts of additional arguments before passing them to the linker.
# It appears as though 1/2 is a usable value.
-@@ -7496,7 +8107,7 @@
+@@ -8315,7 +8196,7 @@
symcode='[BCDEGQRST]'
;;
solaris* | sysv5*)
@@ -18077,7 +15225,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -7514,7 +8125,7 @@
+@@ -8333,7 +8214,7 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -18086,7 +15234,7 @@
esac
# Try without a prefix undercore, then with it.
-@@ -8234,6 +8845,10 @@
+@@ -9053,6 +8934,10 @@
@@ -18097,35 +15245,35 @@
lt_prog_compiler_no_builtin_flag=
-@@ -8259,11 +8874,11 @@
+@@ -9078,11 +8963,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8262: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8877: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9081: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8966: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:8266: \$? = $ac_status" >&5
-+ echo "$as_me:8881: \$? = $ac_status" >&5
+- echo "$as_me:9085: \$? = $ac_status" >&5
++ echo "$as_me:8970: \$? = $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
-@@ -8492,11 +9107,11 @@
+@@ -9311,11 +9196,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8495: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9110: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9314: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9199: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:8499: \$? = $ac_status" >&5
-+ echo "$as_me:9114: \$? = $ac_status" >&5
+- echo "$as_me:9318: \$? = $ac_status" >&5
++ echo "$as_me:9203: \$? = $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
-@@ -8543,13 +9158,6 @@
+@@ -9362,13 +9247,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -18139,21 +15287,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -8559,11 +9167,11 @@
+@@ -9378,11 +9256,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8562: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9170: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9381: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9259: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:8566: \$? = $ac_status" >&5
-+ echo "$as_me:9174: \$? = $ac_status" >&5
+- echo "$as_me:9385: \$? = $ac_status" >&5
++ echo "$as_me:9263: \$? = $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
-@@ -8573,8 +9181,11 @@
+@@ -9392,8 +9270,11 @@
fi
fi
chmod u+w .
@@ -18167,7 +15315,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -8702,7 +9313,7 @@
+@@ -9521,7 +9402,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -18176,7 +15324,7 @@
else
ld_shlibs=no
fi
-@@ -8712,13 +9323,13 @@
+@@ -9531,13 +9412,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -18192,7 +15340,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -8727,19 +9338,19 @@
+@@ -9546,19 +9427,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -18216,7 +15364,7 @@
fi
;;
-@@ -8757,8 +9368,8 @@
+@@ -9576,8 +9457,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -18227,7 +15375,7 @@
else
ld_shlibs=no
fi
-@@ -8771,10 +9382,36 @@
+@@ -9590,10 +9471,36 @@
hardcode_shlibpath_var=no
;;
@@ -18266,7 +15414,7 @@
else
ld_shlibs=no
fi
-@@ -8824,9 +9461,20 @@
+@@ -9643,9 +9550,20 @@
else
export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -18289,7 +15437,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -8872,23 +9520,27 @@
+@@ -9691,21 +9609,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -18313,51 +15461,12 @@
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an empty executable.
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -8900,11 +9552,20 @@
+ /* confdefs.h. */
_ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -8918,24 +9579,28 @@
- }'`; fi
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
+ cat confdefs.h >>conftest.$ac_ext
+@@ -9756,14 +9675,13 @@
+ conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -18374,54 +15483,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -8947,11 +9612,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -8965,9 +9639,11 @@
- }'`; fi
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -8981,7 +9657,7 @@
+@@ -9828,7 +9746,7 @@
whole_archive_flag_spec=' '
archive_cmds_need_lc=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -18430,7 +15492,7 @@
fi
fi
;;
-@@ -9004,13 +9680,13 @@
+@@ -9851,13 +9769,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -18447,7 +15509,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds='true'
# FIXME: Should let the user specify the lib program.
-@@ -9024,21 +9700,21 @@
+@@ -9871,21 +9789,21 @@
archive_cmds_need_lc=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -18482,7 +15544,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -9047,18 +9723,18 @@
+@@ -9894,18 +9812,18 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -18507,7 +15569,7 @@
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
-@@ -9099,8 +9775,8 @@
+@@ -9946,8 +9864,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -18518,7 +15580,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -9108,7 +9784,7 @@
+@@ -9955,7 +9873,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -18527,7 +15589,7 @@
else
archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -9126,10 +9802,10 @@
+@@ -9973,10 +9891,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -18540,7 +15602,7 @@
;;
esac
else
-@@ -9176,7 +9852,7 @@
+@@ -10023,7 +9941,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -18549,7 +15611,7 @@
else
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld='-rpath $libdir'
-@@ -9186,7 +9862,7 @@
+@@ -10033,7 +9951,7 @@
link_all_deplibs=yes
;;
@@ -18558,7 +15620,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -9209,7 +9885,7 @@
+@@ -10056,7 +9974,7 @@
hardcode_direct=yes
hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -18567,7 +15629,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -9219,7 +9895,7 @@
+@@ -10066,7 +9984,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -18576,7 +15638,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -9230,14 +9906,14 @@
+@@ -10077,14 +9995,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -18593,7 +15655,7 @@
else
allow_undefined_flag=' -expect_unresolved \*'
archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -9249,7 +9925,7 @@
+@@ -10096,7 +10014,7 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -18602,7 +15664,7 @@
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag=' -expect_unresolved \*'
-@@ -9274,9 +9950,9 @@
+@@ -10121,9 +10039,9 @@
solaris*)
no_undefined_flag=' -z text'
if test "$GCC" = yes; then
@@ -18614,7 +15676,7 @@
else
archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -9296,7 +9972,7 @@
+@@ -10143,7 +10061,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -18623,7 +15685,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -9356,9 +10032,9 @@
+@@ -10203,9 +10121,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -18635,7 +15697,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var=no
-@@ -9464,7 +10140,7 @@
+@@ -10311,7 +10229,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -18644,7 +15706,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -9474,7 +10150,20 @@
+@@ -10321,7 +10239,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -18666,7 +15728,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -9539,7 +10228,7 @@
+@@ -10386,7 +10317,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -18675,7 +15737,7 @@
;;
beos*)
-@@ -9564,7 +10253,7 @@
+@@ -10411,7 +10342,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -18684,7 +15746,7 @@
need_version=no
need_lib_prefix=no
-@@ -9629,7 +10318,7 @@
+@@ -10476,7 +10407,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -18693,7 +15755,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -9652,7 +10341,7 @@
+@@ -10499,7 +10430,7 @@
dynamic_linker=no
;;
@@ -18702,7 +15764,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -9712,7 +10401,7 @@
+@@ -10559,7 +10490,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -18711,7 +15773,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -9727,7 +10416,7 @@
+@@ -10574,7 +10505,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -18720,7 +15782,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -9738,7 +10427,7 @@
+@@ -10585,7 +10516,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -18729,7 +15791,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -9800,22 +10489,19 @@
+@@ -10647,22 +10578,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -18758,7 +15820,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -9825,6 +10511,30 @@
+@@ -10672,6 +10600,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -18789,7 +15851,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -9834,7 +10544,7 @@
+@@ -10681,7 +10633,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -18798,7 +15860,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -9863,7 +10573,7 @@
+@@ -10710,7 +10662,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -18807,7 +15869,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -9883,7 +10593,7 @@
+@@ -10730,7 +10682,7 @@
os2*)
libname_spec='$name'
@@ -18816,485 +15878,25 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -10082,8 +10792,11 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -10102,11 +10815,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -10115,10 +10837,12 @@
- ac_cv_lib_dl_dlopen=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_dl_dlopen=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-@@ -10142,43 +10866,72 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define shl_load innocuous_shl_load
-+
- /* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char shl_load (); below. */
--#include <assert.h>
-+ which can conflict with char shl_load (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef shl_load
-+
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
-+{
- #endif
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
- char shl_load ();
--char (*f) ();
--
--int
--main ()
--{
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
- #if defined (__stub_shl_load) || defined (__stub___shl_load)
- choke me
- #else
--f = shl_load;
-+char (*f) () = shl_load;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
-
-+int
-+main ()
-+{
-+return f != shl_load;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -10187,10 +10940,12 @@
- ac_cv_func_shl_load=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_func_shl_load=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
- echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-@@ -10205,8 +10960,11 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -10225,11 +10983,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -10238,10 +11005,12 @@
- ac_cv_lib_dld_shl_load=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_dld_shl_load=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-@@ -10255,43 +11024,72 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define dlopen innocuous_dlopen
-+
- /* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char dlopen (); below. */
--#include <assert.h>
-+ which can conflict with char dlopen (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef dlopen
-+
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
-+{
- #endif
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
- char dlopen ();
--char (*f) ();
--
--int
--main ()
--{
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
- #if defined (__stub_dlopen) || defined (__stub___dlopen)
- choke me
- #else
--f = dlopen;
-+char (*f) () = dlopen;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
-
-+int
-+main ()
-+{
-+return f != dlopen;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -10300,10 +11098,12 @@
- ac_cv_func_dlopen=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_func_dlopen=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
- echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-@@ -10318,8 +11118,11 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -10338,11 +11141,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -10351,10 +11163,12 @@
- ac_cv_lib_dl_dlopen=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_dl_dlopen=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-@@ -10370,8 +11184,11 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsvld $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -10390,11 +11207,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -10403,10 +11229,12 @@
- ac_cv_lib_svld_dlopen=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_svld_dlopen=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-@@ -10422,8 +11250,11 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -10442,11 +11273,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -10455,10 +11295,12 @@
- ac_cv_lib_dld_dld_link=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_dld_dld_link=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-@@ -10513,7 +11355,7 @@
+@@ -11492,7 +11444,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 10516 "configure"
-+#line 11358 "configure"
+-#line 11495 "configure"
++#line 11447 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -10611,7 +11453,7 @@
+@@ -11590,7 +11542,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 10614 "configure"
-+#line 11456 "configure"
+-#line 11593 "configure"
++#line 11545 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -10736,7 +11578,7 @@
+@@ -11715,7 +11667,7 @@
fi
;;
@@ -19303,7 +15905,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -10746,29 +11588,29 @@
+@@ -11725,29 +11677,29 @@
archive_cmds_need_lc=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -19347,7 +15949,7 @@
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
-@@ -10802,7 +11644,8 @@
+@@ -11781,7 +11733,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -19357,7 +15959,16 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -10980,7 +11823,7 @@
+@@ -11884,7 +11837,7 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA.
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -11959,7 +11912,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -19366,7 +15977,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -11011,7 +11854,7 @@
+@@ -11990,7 +11943,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -19375,7 +15986,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -11253,7 +12096,10 @@
+@@ -12232,7 +12185,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -19387,7 +15998,7 @@
fi
-@@ -11521,8 +12367,8 @@
+@@ -12500,8 +12456,8 @@
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
if test "$with_gnu_ld" = yes; then
@@ -19398,7 +16009,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -11548,7 +12394,7 @@
+@@ -12527,7 +12483,7 @@
# linker, instead of GNU ld. If possible, this setting should
# overridden to take advantage of the native linker features on
# the platform it is being used on.
@@ -19407,7 +16018,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -11579,8 +12425,22 @@
+@@ -12558,8 +12514,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -19432,7 +16043,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -11626,23 +12486,27 @@
+@@ -12605,15 +12575,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -19453,55 +16064,8 @@
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_CXX='-berok'
- # Determine the default libpath from the value encoded in an empty executable.
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
+@@ -12672,13 +12643,12 @@
- int
- main ()
-@@ -11654,11 +12518,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -11672,25 +12545,29 @@
- }'`; fi
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_cmds_CXX="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
@@ -19516,54 +16080,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -11702,11 +12579,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -11720,9 +12606,11 @@
- }'`; fi
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
- hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -11736,7 +12624,7 @@
+@@ -12743,7 +12713,7 @@
whole_archive_flag_spec_CXX=' '
archive_cmds_need_lc_CXX=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -19572,7 +16089,7 @@
fi
fi
;;
-@@ -11753,12 +12641,12 @@
+@@ -12760,12 +12730,12 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_CXX='-L$libdir'
@@ -19587,7 +16104,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -11767,7 +12655,7 @@
+@@ -12774,7 +12744,7 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -19596,7 +16113,7 @@
else
ld_shlibs_CXX=no
fi
-@@ -11778,20 +12666,20 @@
+@@ -12785,20 +12755,20 @@
archive_cmds_need_lc_CXX=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -19605,15 +16122,15 @@
;;
*) # Darwin 1.3 on
if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- allow_undefined_flag_CXX='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+ allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.012)
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- allow_undefined_flag_CXX='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- ;;
- 10.*)
-- allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+- allow_undefined_flag_CXX='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
+ case ${MACOSX_DEPLOYMENT_TARGET} in
@@ -19627,7 +16144,7 @@
fi
;;
esac
-@@ -11801,19 +12689,19 @@
+@@ -12808,19 +12778,19 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -19653,7 +16170,7 @@
hardcode_direct_CXX=no
hardcode_automatic_CXX=yes
hardcode_shlibpath_var_CXX=unsupported
-@@ -11848,7 +12736,7 @@
+@@ -12855,7 +12825,7 @@
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
@@ -19662,7 +16179,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -11870,7 +12758,7 @@
+@@ -12877,7 +12847,7 @@
ld_shlibs_CXX=no
;;
aCC)
@@ -19671,7 +16188,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -11879,11 +12767,11 @@
+@@ -12886,11 +12856,11 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -19685,7 +16202,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -11940,7 +12828,7 @@
+@@ -12947,7 +12917,7 @@
archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -19694,7 +16211,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -11961,7 +12849,7 @@
+@@ -12968,7 +12938,7 @@
archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -19703,7 +16220,7 @@
;;
esac
fi
-@@ -11976,7 +12864,7 @@
+@@ -12983,7 +12953,7 @@
case $cc_basename in
CC)
# SGI C++
@@ -19712,7 +16229,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -11987,9 +12875,9 @@
+@@ -12994,9 +12964,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -19724,7 +16241,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -12006,8 +12894,8 @@
+@@ -13013,8 +12983,8 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -19735,7 +16252,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -12029,16 +12917,16 @@
+@@ -13036,16 +13006,16 @@
# Intel C++
with_gnu_ld=yes
archive_cmds_need_lc_CXX=no
@@ -19756,7 +16273,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -12076,7 +12964,7 @@
+@@ -13083,7 +13053,7 @@
;;
esac
;;
@@ -19765,7 +16282,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -12095,7 +12983,7 @@
+@@ -13102,7 +13072,7 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -19774,7 +16291,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -12112,7 +13000,7 @@
+@@ -13119,7 +13089,7 @@
;;
cxx)
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -19783,7 +16300,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -12130,7 +13018,7 @@
+@@ -13137,7 +13107,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -19792,7 +16309,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -12155,7 +13043,7 @@
+@@ -13162,7 +13132,7 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -19801,7 +16318,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -12171,10 +13059,10 @@
+@@ -13178,10 +13148,10 @@
;;
cxx)
allow_undefined_flag_CXX=' -expect_unresolved \*'
@@ -19814,7 +16331,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -12193,7 +13081,7 @@
+@@ -13200,7 +13170,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -19823,7 +16340,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -12250,9 +13138,9 @@
+@@ -13257,9 +13227,9 @@
CC)
# Sun C++ 4.2, 5.x and Centerline C++
no_undefined_flag_CXX=' -zdefs'
@@ -19835,7 +16352,7 @@
hardcode_libdir_flag_spec_CXX='-R$libdir'
hardcode_shlibpath_var_CXX=no
-@@ -12286,7 +13174,7 @@
+@@ -13293,7 +13263,7 @@
;;
gcx)
# Green Hills C++ Compiler
@@ -19844,7 +16361,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -12296,9 +13184,9 @@
+@@ -13303,9 +13273,9 @@
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -19856,7 +16373,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -12307,9 +13195,9 @@
+@@ -13314,9 +13284,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -19868,7 +16385,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -12354,6 +13242,10 @@
+@@ -13361,6 +13331,10 @@
GCC_CXX="$GXX"
LD_CXX="$LD"
@@ -19879,7 +16396,7 @@
cat > conftest.$ac_ext <<EOF
class Foo
-@@ -12420,7 +13312,7 @@
+@@ -13427,7 +13401,7 @@
fi
;;
@@ -19888,7 +16405,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -12555,7 +13447,7 @@
+@@ -13562,7 +13536,7 @@
;;
esac
;;
@@ -19897,7 +16414,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -12631,7 +13523,7 @@
+@@ -13638,7 +13612,7 @@
;;
esac
;;
@@ -19906,21 +16423,21 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -12742,11 +13634,11 @@
+@@ -13749,11 +13723,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:12745: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13637: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13752: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13726: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:12749: \$? = $ac_status" >&5
-+ echo "$as_me:13641: \$? = $ac_status" >&5
+- echo "$as_me:13756: \$? = $ac_status" >&5
++ echo "$as_me:13730: \$? = $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
-@@ -12793,13 +13685,6 @@
+@@ -13800,13 +13774,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -19934,21 +16451,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -12809,11 +13694,11 @@
+@@ -13816,11 +13783,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:12812: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13697: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13819: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13786: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:12816: \$? = $ac_status" >&5
-+ echo "$as_me:13701: \$? = $ac_status" >&5
+- echo "$as_me:13823: \$? = $ac_status" >&5
++ echo "$as_me:13790: \$? = $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
-@@ -12823,8 +13708,11 @@
+@@ -13830,8 +13797,11 @@
fi
fi
chmod u+w .
@@ -19962,7 +16479,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -12876,6 +13764,9 @@
+@@ -13883,6 +13853,9 @@
cygwin* | mingw*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -19972,7 +16489,7 @@
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -12957,7 +13848,7 @@
+@@ -13964,7 +13937,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -19981,7 +16498,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -12967,7 +13858,20 @@
+@@ -13974,7 +13947,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -20003,7 +16520,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -13032,7 +13936,7 @@
+@@ -14039,7 +14025,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -20012,7 +16529,7 @@
;;
beos*)
-@@ -13057,7 +13961,7 @@
+@@ -14064,7 +14050,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -20021,7 +16538,7 @@
need_version=no
need_lib_prefix=no
-@@ -13122,7 +14026,7 @@
+@@ -14129,7 +14115,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -20030,7 +16547,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -13145,7 +14049,7 @@
+@@ -14152,7 +14138,7 @@
dynamic_linker=no
;;
@@ -20039,7 +16556,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -13205,7 +14109,7 @@
+@@ -14212,7 +14198,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -20048,7 +16565,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -13220,7 +14124,7 @@
+@@ -14227,7 +14213,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -20057,7 +16574,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -13231,7 +14135,7 @@
+@@ -14238,7 +14224,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -20066,7 +16583,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -13293,22 +14197,19 @@
+@@ -14300,22 +14286,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -20095,7 +16612,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -13318,6 +14219,30 @@
+@@ -14325,6 +14308,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -20126,7 +16643,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -13327,7 +14252,7 @@
+@@ -14334,7 +14341,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -20135,7 +16652,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -13356,7 +14281,7 @@
+@@ -14363,7 +14370,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -20144,7 +16661,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -13376,7 +14301,7 @@
+@@ -14383,7 +14390,7 @@
os2*)
libname_spec='$name'
@@ -20153,485 +16670,25 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -13575,8 +14500,11 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -13595,11 +14523,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -13608,10 +14545,12 @@
- ac_cv_lib_dl_dlopen=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_dl_dlopen=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-@@ -13635,43 +14574,72 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define shl_load innocuous_shl_load
-+
- /* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char shl_load (); below. */
--#include <assert.h>
-+ which can conflict with char shl_load (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef shl_load
-+
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
-+{
- #endif
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
- char shl_load ();
--char (*f) ();
--
--int
--main ()
--{
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
- #if defined (__stub_shl_load) || defined (__stub___shl_load)
- choke me
- #else
--f = shl_load;
-+char (*f) () = shl_load;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
-
-+int
-+main ()
-+{
-+return f != shl_load;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -13680,10 +14648,12 @@
- ac_cv_func_shl_load=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_func_shl_load=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
- echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-@@ -13698,8 +14668,11 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -13718,11 +14691,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -13731,10 +14713,12 @@
- ac_cv_lib_dld_shl_load=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_dld_shl_load=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-@@ -13748,43 +14732,72 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define dlopen innocuous_dlopen
-+
- /* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char dlopen (); below. */
--#include <assert.h>
-+ which can conflict with char dlopen (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef dlopen
-+
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
-+{
- #endif
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
- char dlopen ();
--char (*f) ();
--
--int
--main ()
--{
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
- #if defined (__stub_dlopen) || defined (__stub___dlopen)
- choke me
- #else
--f = dlopen;
-+char (*f) () = dlopen;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
-
-+int
-+main ()
-+{
-+return f != dlopen;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -13793,10 +14806,12 @@
- ac_cv_func_dlopen=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_func_dlopen=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
- echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-@@ -13811,8 +14826,11 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -13831,11 +14849,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -13844,10 +14871,12 @@
- ac_cv_lib_dl_dlopen=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_dl_dlopen=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-@@ -13863,8 +14892,11 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsvld $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -13883,11 +14915,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -13896,10 +14937,12 @@
- ac_cv_lib_svld_dlopen=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_svld_dlopen=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-@@ -13915,8 +14958,11 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -13935,11 +14981,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -13948,10 +15003,12 @@
- ac_cv_lib_dld_dld_link=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_dld_dld_link=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-@@ -14006,7 +15063,7 @@
+@@ -15145,7 +15152,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 14009 "configure"
-+#line 15066 "configure"
+-#line 15148 "configure"
++#line 15155 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -14104,7 +15161,7 @@
+@@ -15243,7 +15250,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 14107 "configure"
-+#line 15164 "configure"
+-#line 15246 "configure"
++#line 15253 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -14221,7 +15278,8 @@
+@@ -15360,7 +15367,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -20641,7 +16698,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -14351,7 +15409,7 @@
+@@ -15490,7 +15498,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -20650,7 +16707,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -14382,7 +15440,7 @@
+@@ -15521,7 +15529,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -20659,7 +16716,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -14599,7 +15657,10 @@
+@@ -15738,7 +15746,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -20671,7 +16728,7 @@
fi
-@@ -14701,7 +15762,7 @@
+@@ -15840,7 +15851,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -20680,21 +16737,21 @@
test "$enable_shared" = yes && enable_static=no
;;
esac
-@@ -14927,11 +15988,11 @@
+@@ -16066,11 +16077,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14930: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15991: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16069: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16080: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:14934: \$? = $ac_status" >&5
-+ echo "$as_me:15995: \$? = $ac_status" >&5
+- echo "$as_me:16073: \$? = $ac_status" >&5
++ echo "$as_me:16084: \$? = $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
-@@ -14978,13 +16039,6 @@
+@@ -16117,13 +16128,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -20708,21 +16765,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -14994,11 +16048,11 @@
+@@ -16133,11 +16137,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14997: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16051: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16136: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16140: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:15001: \$? = $ac_status" >&5
-+ echo "$as_me:16055: \$? = $ac_status" >&5
+- echo "$as_me:16140: \$? = $ac_status" >&5
++ echo "$as_me:16144: \$? = $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
-@@ -15008,8 +16062,11 @@
+@@ -16147,8 +16151,11 @@
fi
fi
chmod u+w .
@@ -20736,7 +16793,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -15137,7 +16194,7 @@
+@@ -16276,7 +16283,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -20745,7 +16802,7 @@
else
ld_shlibs_F77=no
fi
-@@ -15147,13 +16204,13 @@
+@@ -16286,13 +16293,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_F77='-L$libdir'
@@ -20761,7 +16818,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -15162,19 +16219,19 @@
+@@ -16301,19 +16308,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -20785,7 +16842,7 @@
fi
;;
-@@ -15192,8 +16249,8 @@
+@@ -16331,8 +16338,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -20796,7 +16853,7 @@
else
ld_shlibs_F77=no
fi
-@@ -15206,10 +16263,36 @@
+@@ -16345,10 +16352,36 @@
hardcode_shlibpath_var_F77=no
;;
@@ -20835,7 +16892,7 @@
else
ld_shlibs_F77=no
fi
-@@ -15259,9 +16342,20 @@
+@@ -16398,9 +16431,20 @@
else
export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -20858,7 +16915,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -15307,32 +16401,42 @@
+@@ -16446,21 +16490,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -20886,39 +16943,8 @@
program main
end
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -15346,19 +16450,20 @@
- }'`; fi
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
+@@ -16501,14 +16546,13 @@
+ conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -20935,44 +16961,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -15368,11 +16473,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -15386,9 +16500,11 @@
- }'`; fi
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
- hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -15402,7 +16518,7 @@
+@@ -16563,7 +16607,7 @@
whole_archive_flag_spec_F77=' '
archive_cmds_need_lc_F77=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -20981,7 +16970,7 @@
fi
fi
;;
-@@ -15425,13 +16541,13 @@
+@@ -16586,13 +16630,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -20998,7 +16987,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_F77='true'
# FIXME: Should let the user specify the lib program.
-@@ -15445,21 +16561,21 @@
+@@ -16606,21 +16650,21 @@
archive_cmds_need_lc_F77=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -21007,14 +16996,14 @@
;;
*) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.012)
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- ;;
- 10.*)
-- allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+- allow_undefined_flag_F77='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
- fi
@@ -21033,7 +17022,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -15468,18 +16584,18 @@
+@@ -16629,18 +16673,18 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -21058,7 +17047,7 @@
hardcode_direct_F77=no
hardcode_automatic_F77=yes
hardcode_shlibpath_var_F77=unsupported
-@@ -15520,8 +16636,8 @@
+@@ -16681,8 +16725,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -21069,7 +17058,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -15529,7 +16645,7 @@
+@@ -16690,7 +16734,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -21078,7 +17067,7 @@
else
archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -15547,10 +16663,10 @@
+@@ -16708,10 +16752,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -21091,7 +17080,7 @@
;;
esac
else
-@@ -15597,7 +16713,7 @@
+@@ -16758,7 +16802,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -21100,7 +17089,7 @@
else
archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-@@ -15607,7 +16723,7 @@
+@@ -16768,7 +16812,7 @@
link_all_deplibs_F77=yes
;;
@@ -21109,7 +17098,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -15630,7 +16746,7 @@
+@@ -16791,7 +16835,7 @@
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -21118,7 +17107,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -15640,7 +16756,7 @@
+@@ -16801,7 +16845,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -21127,7 +17116,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -15651,14 +16767,14 @@
+@@ -16812,14 +16856,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -21144,7 +17133,7 @@
else
allow_undefined_flag_F77=' -expect_unresolved \*'
archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -15670,7 +16786,7 @@
+@@ -16831,7 +16875,7 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -21153,7 +17142,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag_F77=' -expect_unresolved \*'
-@@ -15695,9 +16811,9 @@
+@@ -16856,9 +16900,9 @@
solaris*)
no_undefined_flag_F77=' -z text'
if test "$GCC" = yes; then
@@ -21165,7 +17154,7 @@
else
archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -15717,7 +16833,7 @@
+@@ -16878,7 +16922,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -21174,7 +17163,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -15777,9 +16893,9 @@
+@@ -16938,9 +16982,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_F77='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -21186,7 +17175,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_F77=no
-@@ -15885,7 +17001,7 @@
+@@ -17046,7 +17090,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -21195,7 +17184,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -15895,7 +17011,20 @@
+@@ -17056,7 +17100,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -21217,7 +17206,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -15960,7 +17089,7 @@
+@@ -17121,7 +17178,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -21226,7 +17215,7 @@
;;
beos*)
-@@ -15985,7 +17114,7 @@
+@@ -17146,7 +17203,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -21235,7 +17224,7 @@
need_version=no
need_lib_prefix=no
-@@ -16050,7 +17179,7 @@
+@@ -17211,7 +17268,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -21244,7 +17233,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -16073,7 +17202,7 @@
+@@ -17234,7 +17291,7 @@
dynamic_linker=no
;;
@@ -21253,7 +17242,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -16133,7 +17262,7 @@
+@@ -17294,7 +17351,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -21262,7 +17251,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -16148,7 +17277,7 @@
+@@ -17309,7 +17366,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -21271,7 +17260,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -16159,7 +17288,7 @@
+@@ -17320,7 +17377,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -21280,7 +17269,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -16221,22 +17350,19 @@
+@@ -17382,22 +17439,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -21309,7 +17298,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -16246,6 +17372,30 @@
+@@ -17407,6 +17461,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -21340,7 +17329,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -16255,7 +17405,7 @@
+@@ -17416,7 +17494,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -21349,7 +17338,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -16284,7 +17434,7 @@
+@@ -17445,7 +17523,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -21358,7 +17347,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -16304,7 +17454,7 @@
+@@ -17465,7 +17543,7 @@
os2*)
libname_spec='$name'
@@ -21367,7 +17356,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -16483,7 +17633,8 @@
+@@ -17644,7 +17722,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -21377,7 +17366,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -16613,7 +17764,7 @@
+@@ -17774,7 +17853,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -21386,7 +17375,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -16644,7 +17795,7 @@
+@@ -17805,7 +17884,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -21395,7 +17384,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -16861,7 +18012,10 @@
+@@ -18022,7 +18101,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -21407,7 +17396,7 @@
fi
-@@ -16914,6 +18068,10 @@
+@@ -18075,6 +18157,10 @@
# GCJ did not exist at the time GCC didn't implicitly link libc in.
archive_cmds_need_lc_GCJ=no
@@ -21418,35 +17407,35 @@
lt_prog_compiler_no_builtin_flag_GCJ=
-@@ -16939,11 +18097,11 @@
+@@ -18100,11 +18186,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16942: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18100: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18103: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18189: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16946: \$? = $ac_status" >&5
-+ echo "$as_me:18104: \$? = $ac_status" >&5
+- echo "$as_me:18107: \$? = $ac_status" >&5
++ echo "$as_me:18193: \$? = $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
-@@ -17172,11 +18330,11 @@
+@@ -18333,11 +18419,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17175: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18333: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18336: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18422: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:17179: \$? = $ac_status" >&5
-+ echo "$as_me:18337: \$? = $ac_status" >&5
+- echo "$as_me:18340: \$? = $ac_status" >&5
++ echo "$as_me:18426: \$? = $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
-@@ -17223,13 +18381,6 @@
+@@ -18384,13 +18470,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -21460,21 +17449,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -17239,11 +18390,11 @@
+@@ -18400,11 +18479,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17242: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18393: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18403: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18482: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:17246: \$? = $ac_status" >&5
-+ echo "$as_me:18397: \$? = $ac_status" >&5
+- echo "$as_me:18407: \$? = $ac_status" >&5
++ echo "$as_me:18486: \$? = $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
-@@ -17253,8 +18404,11 @@
+@@ -18414,8 +18493,11 @@
fi
fi
chmod u+w .
@@ -21488,7 +17477,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -17382,7 +18536,7 @@
+@@ -18543,7 +18625,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -21497,7 +17486,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -17392,13 +18546,13 @@
+@@ -18553,13 +18635,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_GCJ='-L$libdir'
@@ -21513,7 +17502,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -17407,19 +18561,19 @@
+@@ -18568,19 +18650,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -21537,7 +17526,7 @@
fi
;;
-@@ -17437,8 +18591,8 @@
+@@ -18598,8 +18680,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -21548,7 +17537,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -17451,10 +18605,36 @@
+@@ -18612,10 +18694,36 @@
hardcode_shlibpath_var_GCJ=no
;;
@@ -21587,7 +17576,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -17504,9 +18684,20 @@
+@@ -18665,9 +18773,20 @@
else
export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -21610,7 +17599,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -17552,23 +18743,27 @@
+@@ -18713,21 +18832,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -21634,51 +17623,12 @@
allow_undefined_flag_GCJ='-berok'
# Determine the default libpath from the value encoded in an empty executable.
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -17580,11 +18775,20 @@
+ /* confdefs.h. */
_ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -17598,24 +18802,28 @@
- }'`; fi
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
+ cat confdefs.h >>conftest.$ac_ext
+@@ -18778,14 +18898,13 @@
+ conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -21695,54 +17645,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -17627,11 +18835,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -17645,9 +18862,11 @@
- }'`; fi
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
- hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -17661,7 +18880,7 @@
+@@ -18850,7 +18969,7 @@
whole_archive_flag_spec_GCJ=' '
archive_cmds_need_lc_GCJ=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -21751,7 +17654,7 @@
fi
fi
;;
-@@ -17684,13 +18903,13 @@
+@@ -18873,13 +18992,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -21768,7 +17671,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_GCJ='true'
# FIXME: Should let the user specify the lib program.
-@@ -17704,21 +18923,21 @@
+@@ -18893,21 +19012,21 @@
archive_cmds_need_lc_GCJ=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -21777,14 +17680,14 @@
;;
*) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- allow_undefined_flag_GCJ='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.012)
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- allow_undefined_flag_GCJ='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- ;;
- 10.*)
-- allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+- allow_undefined_flag_GCJ='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
- fi
@@ -21803,7 +17706,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -17727,18 +18946,18 @@
+@@ -18916,18 +19035,18 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -21828,7 +17731,7 @@
hardcode_direct_GCJ=no
hardcode_automatic_GCJ=yes
hardcode_shlibpath_var_GCJ=unsupported
-@@ -17779,8 +18998,8 @@
+@@ -18968,8 +19087,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -21839,7 +17742,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -17788,7 +19007,7 @@
+@@ -18977,7 +19096,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -21848,7 +17751,7 @@
else
archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -17806,10 +19025,10 @@
+@@ -18995,10 +19114,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -21861,7 +17764,7 @@
;;
esac
else
-@@ -17856,7 +19075,7 @@
+@@ -19045,7 +19164,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -21870,7 +17773,7 @@
else
archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
-@@ -17866,7 +19085,7 @@
+@@ -19055,7 +19174,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -21879,7 +17782,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -17889,7 +19108,7 @@
+@@ -19078,7 +19197,7 @@
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -21888,7 +17791,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -17899,7 +19118,7 @@
+@@ -19088,7 +19207,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -21897,7 +17800,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -17910,14 +19129,14 @@
+@@ -19099,14 +19218,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -21914,7 +17817,7 @@
else
allow_undefined_flag_GCJ=' -expect_unresolved \*'
archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -17929,7 +19148,7 @@
+@@ -19118,7 +19237,7 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -21923,7 +17826,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag_GCJ=' -expect_unresolved \*'
-@@ -17954,9 +19173,9 @@
+@@ -19143,9 +19262,9 @@
solaris*)
no_undefined_flag_GCJ=' -z text'
if test "$GCC" = yes; then
@@ -21935,7 +17838,7 @@
else
archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -17976,7 +19195,7 @@
+@@ -19165,7 +19284,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -21944,7 +17847,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -18036,9 +19255,9 @@
+@@ -19225,9 +19344,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_GCJ='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -21956,7 +17859,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_GCJ=no
-@@ -18144,7 +19363,7 @@
+@@ -19333,7 +19452,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -21965,7 +17868,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -18154,7 +19373,20 @@
+@@ -19343,7 +19462,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -21987,7 +17890,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -18219,7 +19451,7 @@
+@@ -19408,7 +19540,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -21996,7 +17899,7 @@
;;
beos*)
-@@ -18244,7 +19476,7 @@
+@@ -19433,7 +19565,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -22005,7 +17908,7 @@
need_version=no
need_lib_prefix=no
-@@ -18309,7 +19541,7 @@
+@@ -19498,7 +19630,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -22014,7 +17917,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -18332,7 +19564,7 @@
+@@ -19521,7 +19653,7 @@
dynamic_linker=no
;;
@@ -22023,7 +17926,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -18392,7 +19624,7 @@
+@@ -19581,7 +19713,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -22032,7 +17935,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -18407,7 +19639,7 @@
+@@ -19596,7 +19728,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -22041,7 +17944,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -18418,7 +19650,7 @@
+@@ -19607,7 +19739,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -22050,7 +17953,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -18480,22 +19712,19 @@
+@@ -19669,22 +19801,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -22079,19 +17982,14 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -18505,16 +19734,40 @@
+@@ -19694,6 +19823,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
--netbsd*)
-- version_type=sunos
+netbsdelf*-gnu)
+ version_type=linux
- need_lib_prefix=no
- 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'
++ need_lib_prefix=no
++ 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
@@ -22112,13 +18010,11 @@
+ dynamic_linker='GNU ld.so'
+ ;;
+
-+netbsd*)
-+ version_type=sunos
-+ need_lib_prefix=no
-+ 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'
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -19703,7 +19856,7 @@
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
@@ -22126,7 +18022,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -18543,7 +19796,7 @@
+@@ -19732,7 +19885,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -22135,7 +18031,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -18563,7 +19816,7 @@
+@@ -19752,7 +19905,7 @@
os2*)
libname_spec='$name'
@@ -22144,485 +18040,25 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -18762,8 +20015,11 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -18782,11 +20038,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -18795,10 +20060,12 @@
- ac_cv_lib_dl_dlopen=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_dl_dlopen=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-@@ -18822,43 +20089,72 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define shl_load innocuous_shl_load
-+
- /* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char shl_load (); below. */
--#include <assert.h>
-+ which can conflict with char shl_load (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef shl_load
-+
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
-+{
- #endif
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
- char shl_load ();
--char (*f) ();
--
--int
--main ()
--{
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
- #if defined (__stub_shl_load) || defined (__stub___shl_load)
- choke me
- #else
--f = shl_load;
-+char (*f) () = shl_load;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
-
-+int
-+main ()
-+{
-+return f != shl_load;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -18867,10 +20163,12 @@
- ac_cv_func_shl_load=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_func_shl_load=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
- echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-@@ -18885,8 +20183,11 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -18905,11 +20206,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -18918,10 +20228,12 @@
- ac_cv_lib_dld_shl_load=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_dld_shl_load=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-@@ -18935,43 +20247,72 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define dlopen innocuous_dlopen
-+
- /* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char dlopen (); below. */
--#include <assert.h>
-+ which can conflict with char dlopen (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef dlopen
-+
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
-+{
- #endif
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
- char dlopen ();
--char (*f) ();
--
--int
--main ()
--{
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
- #if defined (__stub_dlopen) || defined (__stub___dlopen)
- choke me
- #else
--f = dlopen;
-+char (*f) () = dlopen;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
-
-+int
-+main ()
-+{
-+return f != dlopen;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -18980,10 +20321,12 @@
- ac_cv_func_dlopen=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_func_dlopen=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
- echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-@@ -18998,8 +20341,11 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -19018,11 +20364,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -19031,10 +20386,12 @@
- ac_cv_lib_dl_dlopen=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_dl_dlopen=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-@@ -19050,8 +20407,11 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsvld $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -19070,11 +20430,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -19083,10 +20452,12 @@
- ac_cv_lib_svld_dlopen=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_svld_dlopen=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-@@ -19102,8 +20473,11 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -19122,11 +20496,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -19135,10 +20518,12 @@
- ac_cv_lib_dld_dld_link=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_dld_dld_link=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-@@ -19193,7 +20578,7 @@
+@@ -20514,7 +20667,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 19196 "configure"
-+#line 20581 "configure"
+-#line 20517 "configure"
++#line 20670 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -19291,7 +20676,7 @@
+@@ -20612,7 +20765,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 19294 "configure"
-+#line 20679 "configure"
+-#line 20615 "configure"
++#line 20768 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -19408,7 +20793,8 @@
+@@ -20729,7 +20882,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -22632,7 +18068,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -19538,7 +20924,7 @@
+@@ -20859,7 +21013,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -22641,7 +18077,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -19569,7 +20955,7 @@
+@@ -20890,7 +21044,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -22650,7 +18086,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -19786,7 +21172,10 @@
+@@ -21107,7 +21261,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -22662,7 +18098,7 @@
fi
-@@ -19849,7 +21238,8 @@
+@@ -21170,7 +21327,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -22672,7 +18108,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -19979,7 +21369,7 @@
+@@ -21300,7 +21458,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -22681,7 +18117,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -20010,7 +21400,7 @@
+@@ -21331,7 +21489,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -22690,7 +18126,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -20227,7 +21617,10 @@
+@@ -21548,7 +21706,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -22702,7 +18138,7 @@
fi
-@@ -20274,7 +21667,7 @@
+@@ -21595,7 +21756,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -22711,58 +18147,7 @@
# Prevent multiple expansion
-@@ -20562,8 +21955,11 @@
- else
-
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <string>
- using namespace std;
-@@ -20582,11 +21978,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -20595,10 +22000,11 @@
- kde_cv_stl_works=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- kde_cv_stl_works=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
- fi
-
-@@ -20653,12 +22059,12 @@
+@@ -21994,9 +22155,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -22770,107 +18155,9 @@
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-
- #include <string.h>
-@@ -20679,11 +22085,20 @@
+ /* confdefs.h. */
_ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -20692,10 +22107,11 @@
- kde_cv_func_strlcat=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- kde_cv_func_strlcat=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
- LIBS="$kde_safe_LIBS"
- ac_ext=c
-@@ -20746,8 +22162,11 @@
- kde_safe_libs=$LIBS
- LIBS="$LIBS $X_EXTRA_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-
- #include <string.h>
-@@ -20770,11 +22189,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -20784,11 +22212,13 @@
- kde_cv_proto_strlcat=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- kde_cv_proto_strlcat="strlcat unavailable"
-
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$kde_safe_libs
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -20845,12 +22275,12 @@
+@@ -22213,9 +22371,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -22878,1762 +18165,9 @@
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-
- #include <string.h>
-@@ -20870,11 +22300,20 @@
+ /* confdefs.h. */
_ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -20883,10 +22322,11 @@
- kde_cv_func_strlcpy=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- kde_cv_func_strlcpy=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
- LIBS="$kde_safe_LIBS"
- ac_ext=c
-@@ -20937,8 +22377,11 @@
- kde_safe_libs=$LIBS
- LIBS="$LIBS $X_EXTRA_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-
- #include <string.h>
-@@ -20960,11 +22403,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -20974,11 +22426,13 @@
- kde_cv_proto_strlcpy=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- kde_cv_proto_strlcpy="strlcpy unavailable"
-
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$kde_safe_libs
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -21022,8 +22476,11 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lutil $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-
- int
-@@ -21036,11 +22493,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -21049,10 +22515,12 @@
- ac_cv_lib_util_main=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_util_main=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_util_main" >&5
-@@ -21069,8 +22537,11 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lcompat $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-
- int
-@@ -21083,11 +22554,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -21096,10 +22576,12 @@
- ac_cv_lib_compat_main=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_compat_main=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_compat_main" >&5
-@@ -21117,8 +22599,11 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lcrypt $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -21137,11 +22622,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -21150,10 +22644,12 @@
- ac_cv_lib_crypt_crypt=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_crypt_crypt=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
-@@ -21169,8 +22665,11 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lc $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -21189,11 +22688,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -21202,10 +22710,12 @@
- ac_cv_lib_c_crypt=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_c_crypt=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_c_crypt" >&5
-@@ -21249,8 +22759,11 @@
-
- kde_cv_socklen_t=no
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <sys/types.h>
- #include <sys/socket.h>
-@@ -21268,11 +22781,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -21284,9 +22806,10 @@
-
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -21314,8 +22837,11 @@
-
- for t in int size_t unsigned long "unsigned long"; do
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <sys/types.h>
- #include <sys/socket.h>
-@@ -21333,11 +22859,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -21349,9 +22884,10 @@
-
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -21384,8 +22920,11 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldnet $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -21404,11 +22943,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -21417,10 +22965,12 @@
- ac_cv_lib_dnet_dnet_ntoa=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_dnet_dnet_ntoa=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-@@ -21438,8 +22988,11 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldnet_stub $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -21458,11 +23011,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -21471,10 +23033,12 @@
- ac_cv_lib_dnet_stub_dnet_ntoa=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_dnet_stub_dnet_ntoa=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
-@@ -21490,43 +23054,72 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+/* Define inet_ntoa to an innocuous variant, in case <limits.h> declares inet_ntoa.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define inet_ntoa innocuous_inet_ntoa
-+
- /* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char inet_ntoa (); below. */
--#include <assert.h>
-+ which can conflict with char inet_ntoa (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef inet_ntoa
-+
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
-+{
- #endif
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
- char inet_ntoa ();
--char (*f) ();
--
--int
--main ()
--{
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
- #if defined (__stub_inet_ntoa) || defined (__stub___inet_ntoa)
- choke me
- #else
--f = inet_ntoa;
-+char (*f) () = inet_ntoa;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
-
-+int
-+main ()
-+{
-+return f != inet_ntoa;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -21535,10 +23128,12 @@
- ac_cv_func_inet_ntoa=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_func_inet_ntoa=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
- echo "${ECHO_T}$ac_cv_func_inet_ntoa" >&6
-@@ -21552,8 +23147,11 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lnsl $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -21572,11 +23170,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -21585,10 +23192,12 @@
- ac_cv_lib_nsl_inet_ntoa=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_nsl_inet_ntoa=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5
-@@ -21604,43 +23213,72 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+/* Define connect to an innocuous variant, in case <limits.h> declares connect.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define connect innocuous_connect
-+
- /* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char connect (); below. */
--#include <assert.h>
-+ which can conflict with char connect (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef connect
-+
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
-+{
- #endif
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
- char connect ();
--char (*f) ();
--
--int
--main ()
--{
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
- #if defined (__stub_connect) || defined (__stub___connect)
- choke me
- #else
--f = connect;
-+char (*f) () = connect;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
-
-+int
-+main ()
-+{
-+return f != connect;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -21649,10 +23287,12 @@
- ac_cv_func_connect=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_func_connect=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
- echo "${ECHO_T}$ac_cv_func_connect" >&6
-@@ -21666,8 +23306,11 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -21686,11 +23329,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -21699,10 +23351,12 @@
- ac_cv_lib_socket_connect=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_socket_connect=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-@@ -21719,43 +23373,72 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+/* Define remove to an innocuous variant, in case <limits.h> declares remove.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define remove innocuous_remove
-+
- /* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char remove (); below. */
--#include <assert.h>
-+ which can conflict with char remove (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef remove
-+
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
-+{
- #endif
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
- char remove ();
--char (*f) ();
--
--int
--main ()
--{
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
- #if defined (__stub_remove) || defined (__stub___remove)
- choke me
- #else
--f = remove;
-+char (*f) () = remove;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
-
-+int
-+main ()
-+{
-+return f != remove;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -21764,10 +23447,12 @@
- ac_cv_func_remove=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_func_remove=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
- echo "${ECHO_T}$ac_cv_func_remove" >&6
-@@ -21781,8 +23466,11 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lposix $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -21801,11 +23489,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -21814,10 +23511,12 @@
- ac_cv_lib_posix_remove=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_posix_remove=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
-@@ -21835,43 +23534,72 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define shmat innocuous_shmat
-+
- /* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char shmat (); below. */
--#include <assert.h>
-+ which can conflict with char shmat (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef shmat
-+
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
-+{
- #endif
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
- char shmat ();
--char (*f) ();
--
--int
--main ()
--{
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
- #if defined (__stub_shmat) || defined (__stub___shmat)
- choke me
- #else
--f = shmat;
-+char (*f) () = shmat;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
-
-+int
-+main ()
-+{
-+return f != shmat;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -21880,10 +23608,12 @@
- ac_cv_func_shmat=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_func_shmat=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
- echo "${ECHO_T}$ac_cv_func_shmat" >&6
-@@ -21898,8 +23628,11 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lipc $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -21918,11 +23651,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -21931,10 +23673,12 @@
- ac_cv_lib_ipc_shmat=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_ipc_shmat=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
-@@ -21965,18 +23709,30 @@
- echo "$as_me:$LINENO: checking $ac_header usability" >&5
- echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -21985,10 +23741,11 @@
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6
-
-@@ -21996,8 +23753,11 @@
- echo "$as_me:$LINENO: checking $ac_header presence" >&5
- echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-@@ -22010,6 +23770,7 @@
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-@@ -22020,7 +23781,8 @@
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_header_preproc=no
- fi
- rm -f conftest.err conftest.$ac_ext
-@@ -22028,26 +23790,43 @@
- echo "${ECHO_T}$ac_header_preproc" >&6
-
- # So? What about this header?
--case $ac_header_compiler:$ac_header_preproc in
-- yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-- no:yes )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
- echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists. ##
-+## ------------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
- esac
- echo "$as_me:$LINENO: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- eval "$as_ac_Header=$ac_header_preproc"
-+ eval "$as_ac_Header=\$ac_header_preproc"
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-@@ -22081,18 +23860,30 @@
- echo "$as_me:$LINENO: checking $ac_header usability" >&5
- echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -22101,10 +23892,11 @@
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6
-
-@@ -22112,8 +23904,11 @@
- echo "$as_me:$LINENO: checking $ac_header presence" >&5
- echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-@@ -22126,6 +23921,7 @@
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-@@ -22136,7 +23932,8 @@
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_header_preproc=no
- fi
- rm -f conftest.err conftest.$ac_ext
-@@ -22144,26 +23941,43 @@
- echo "${ECHO_T}$ac_header_preproc" >&6
-
- # So? What about this header?
--case $ac_header_compiler:$ac_header_preproc in
-- yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-- no:yes )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
- echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists. ##
-+## ------------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
- esac
- echo "$as_me:$LINENO: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- eval "$as_ac_Header=$ac_header_preproc"
-+ eval "$as_ac_Header=\$ac_header_preproc"
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-@@ -22188,8 +24002,11 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lpoll $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -22208,11 +24025,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -22221,10 +24047,12 @@
- ac_cv_lib_poll_poll=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_poll_poll=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5
-@@ -22252,18 +24080,30 @@
- echo "$as_me:$LINENO: checking $ac_header usability" >&5
- echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -22272,10 +24112,11 @@
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6
-
-@@ -22283,8 +24124,11 @@
- echo "$as_me:$LINENO: checking $ac_header presence" >&5
- echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-@@ -22297,6 +24141,7 @@
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-@@ -22307,7 +24152,8 @@
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_header_preproc=no
- fi
- rm -f conftest.err conftest.$ac_ext
-@@ -22315,26 +24161,43 @@
- echo "${ECHO_T}$ac_header_preproc" >&6
-
- # So? What about this header?
--case $ac_header_compiler:$ac_header_preproc in
-- yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-- no:yes )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
- echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists. ##
-+## ------------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
- esac
- echo "$as_me:$LINENO: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- eval "$as_ac_Header=$ac_header_preproc"
-+ eval "$as_ac_Header=\$ac_header_preproc"
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-@@ -22364,18 +24227,30 @@
- echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5
- echo $ECHO_N "checking CoreAudio/CoreAudio.h usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- #include <CoreAudio/CoreAudio.h>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -22384,10 +24259,11 @@
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6
-
-@@ -22395,8 +24271,11 @@
- echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5
- echo $ECHO_N "checking CoreAudio/CoreAudio.h presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <CoreAudio/CoreAudio.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-@@ -22409,6 +24288,7 @@
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-@@ -22419,7 +24299,8 @@
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_header_preproc=no
- fi
- rm -f conftest.err conftest.$ac_ext
-@@ -22427,19 +24308,36 @@
- echo "${ECHO_T}$ac_header_preproc" >&6
-
- # So? What about this header?
--case $ac_header_compiler:$ac_header_preproc in
-- yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
- { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: CoreAudio/CoreAudio.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;};;
-- no:yes )
-+ { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
- { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&5
- echo "$as_me: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: CoreAudio/CoreAudio.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: CoreAudio/CoreAudio.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: CoreAudio/CoreAudio.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;};;
-+echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists. ##
-+## ------------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
- esac
- echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
- echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6
-@@ -22471,8 +24369,11 @@
- kde_libs_safe="$LIBS"
- LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <sys/types.h>
- #include <netinet/in.h>
-@@ -22491,11 +24392,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -22513,12 +24423,14 @@
-
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
-
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$kde_libs_safe
-
-
-@@ -22543,12 +24455,12 @@
+@@ -24397,9 +24552,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -24641,4456 +18175,288 @@
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-
- #include <sys/types.h>
-@@ -22569,11 +24481,20 @@
+ /* confdefs.h. */
_ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -22582,10 +24503,11 @@
- kde_cv_func_res_init=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- kde_cv_func_res_init=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
- LIBS="$kde_safe_LIBS"
- ac_ext=c
-@@ -22636,8 +24558,11 @@
- kde_safe_libs=$LIBS
- LIBS="$LIBS $X_EXTRA_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-
- #include <sys/types.h>
-@@ -22660,11 +24585,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -22674,11 +24608,13 @@
- kde_cv_proto_res_init=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- kde_cv_proto_res_init="res_init unavailable"
-
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$kde_safe_libs
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -22726,8 +24662,11 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lucb $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -22746,11 +24685,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -22759,10 +24707,12 @@
- ac_cv_lib_ucb_killpg=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_ucb_killpg=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_killpg" >&5
-@@ -22786,8 +24736,11 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbsd $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -22806,11 +24759,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -22819,10 +24781,12 @@
- ac_cv_lib_bsd_gethostbyname=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_bsd_gethostbyname=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
-@@ -22839,8 +24803,11 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -22855,11 +24822,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -22868,10 +24844,11 @@
- ac_cv_type_int=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_type_int=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
- echo "${ECHO_T}$ac_cv_type_int" >&6
-@@ -22889,8 +24866,11 @@
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -22904,11 +24884,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -22917,8 +24906,11 @@
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -22932,11 +24924,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -22945,22 +24946,27 @@
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_lo=`expr $ac_mid + 1`
-- if test $ac_lo -le $ac_mid; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid + 1`
-+ if test $ac_lo -le $ac_mid; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -22974,11 +24980,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -22987,8 +25002,11 @@
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -23002,11 +25020,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23015,30 +25042,35 @@
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_hi=`expr '(' $ac_mid ')' - 1`
-- if test $ac_mid -le $ac_hi; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid`
-+ if test $ac_mid -le $ac_hi; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_lo= ac_hi=
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -23052,11 +25084,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23065,26 +25106,32 @@
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_int=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77" >&5
--echo "$as_me: error: cannot compute sizeof (int), 77" >&2;}
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (int), 77
-+See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
- esac
- else
- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5
--echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
- { (exit 1); exit 1; }; }
- else
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- long longval () { return (long) (sizeof (int)); }
- unsigned long ulongval () { return (long) (sizeof (int)); }
-@@ -23132,13 +25179,16 @@
- else
- echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77" >&5
--echo "$as_me: error: cannot compute sizeof (int), 77" >&2;}
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (int), 77
-+See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
- rm -f conftest.val
-@@ -23158,8 +25208,11 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -23174,11 +25227,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23187,10 +25249,11 @@
- ac_cv_type_short=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_type_short=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
- echo "${ECHO_T}$ac_cv_type_short" >&6
-@@ -23208,8 +25271,11 @@
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -23223,11 +25289,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23236,8 +25311,11 @@
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -23251,11 +25329,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23264,22 +25351,27 @@
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_lo=`expr $ac_mid + 1`
-- if test $ac_lo -le $ac_mid; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid + 1`
-+ if test $ac_lo -le $ac_mid; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -23293,11 +25385,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23306,8 +25407,11 @@
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -23321,11 +25425,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23334,30 +25447,35 @@
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_hi=`expr '(' $ac_mid ')' - 1`
-- if test $ac_mid -le $ac_hi; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid`
-+ if test $ac_mid -le $ac_hi; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_lo= ac_hi=
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -23371,11 +25489,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23384,26 +25511,32 @@
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_short=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77" >&5
--echo "$as_me: error: cannot compute sizeof (short), 77" >&2;}
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (short), 77
-+See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
- esac
- else
- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5
--echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
- { (exit 1); exit 1; }; }
- else
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- long longval () { return (long) (sizeof (short)); }
- unsigned long ulongval () { return (long) (sizeof (short)); }
-@@ -23451,13 +25584,16 @@
- else
- echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77" >&5
--echo "$as_me: error: cannot compute sizeof (short), 77" >&2;}
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (short), 77
-+See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
- rm -f conftest.val
-@@ -23477,8 +25613,11 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -23493,11 +25632,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23506,10 +25654,11 @@
- ac_cv_type_long=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_type_long=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
- echo "${ECHO_T}$ac_cv_type_long" >&6
-@@ -23527,8 +25676,11 @@
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -23542,11 +25694,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23555,8 +25716,11 @@
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -23570,11 +25734,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23583,22 +25756,27 @@
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_lo=`expr $ac_mid + 1`
-- if test $ac_lo -le $ac_mid; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid + 1`
-+ if test $ac_lo -le $ac_mid; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -23612,11 +25790,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23625,8 +25812,11 @@
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -23640,11 +25830,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23653,30 +25852,35 @@
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_hi=`expr '(' $ac_mid ')' - 1`
-- if test $ac_mid -le $ac_hi; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid`
-+ if test $ac_mid -le $ac_hi; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_lo= ac_hi=
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -23690,11 +25894,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23703,26 +25916,32 @@
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_long=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77" >&5
--echo "$as_me: error: cannot compute sizeof (long), 77" >&2;}
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (long), 77
-+See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
- esac
- else
- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5
--echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
- { (exit 1); exit 1; }; }
- else
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- long longval () { return (long) (sizeof (long)); }
- unsigned long ulongval () { return (long) (sizeof (long)); }
-@@ -23770,13 +25989,16 @@
- else
- echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77" >&5
--echo "$as_me: error: cannot compute sizeof (long), 77" >&2;}
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (long), 77
-+See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
- rm -f conftest.val
-@@ -23796,8 +26018,11 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -23812,11 +26037,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23825,10 +26059,11 @@
- ac_cv_type_char_p=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_type_char_p=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
- echo "${ECHO_T}$ac_cv_type_char_p" >&6
-@@ -23846,8 +26081,11 @@
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -23861,11 +26099,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23874,8 +26121,11 @@
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -23889,11 +26139,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23902,22 +26161,27 @@
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_lo=`expr $ac_mid + 1`
-- if test $ac_lo -le $ac_mid; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid + 1`
-+ if test $ac_lo -le $ac_mid; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -23931,11 +26195,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23944,8 +26217,11 @@
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -23959,11 +26235,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23972,30 +26257,35 @@
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_hi=`expr '(' $ac_mid ')' - 1`
-- if test $ac_mid -le $ac_hi; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid`
-+ if test $ac_mid -le $ac_hi; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_lo= ac_hi=
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -24009,11 +26299,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -24022,26 +26321,32 @@
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_char_p=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77" >&5
--echo "$as_me: error: cannot compute sizeof (char *), 77" >&2;}
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (char *), 77
-+See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
- esac
- else
- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5
--echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
- { (exit 1); exit 1; }; }
- else
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- long longval () { return (long) (sizeof (char *)); }
- unsigned long ulongval () { return (long) (sizeof (char *)); }
-@@ -24089,13 +26394,16 @@
- else
- echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77" >&5
--echo "$as_me: error: cannot compute sizeof (char *), 77" >&2;}
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (char *), 77
-+See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
- rm -f conftest.val
-@@ -24119,8 +26427,11 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -24139,11 +26450,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -24152,10 +26472,12 @@
- ac_cv_lib_dl_dlopen=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_dl_dlopen=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-@@ -24176,8 +26498,11 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -24196,11 +26521,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -24209,10 +26543,12 @@
- ac_cv_lib_dld_shl_unload=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_dld_shl_unload=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_unload" >&5
-@@ -24236,8 +26572,11 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -24252,11 +26591,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -24265,10 +26613,11 @@
- ac_cv_type_size_t=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_type_size_t=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
- echo "${ECHO_T}$ac_cv_type_size_t" >&6
-@@ -24286,8 +26635,11 @@
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -24301,11 +26653,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -24314,8 +26675,11 @@
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -24329,11 +26693,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -24342,22 +26715,27 @@
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_lo=`expr $ac_mid + 1`
-- if test $ac_lo -le $ac_mid; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid + 1`
-+ if test $ac_lo -le $ac_mid; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -24371,11 +26749,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -24384,8 +26771,11 @@
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -24399,11 +26789,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -24412,30 +26811,35 @@
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_hi=`expr '(' $ac_mid ')' - 1`
-- if test $ac_mid -le $ac_hi; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid`
-+ if test $ac_mid -le $ac_hi; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_lo= ac_hi=
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -24449,11 +26853,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -24462,26 +26875,32 @@
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_size_t=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77" >&5
--echo "$as_me: error: cannot compute sizeof (size_t), 77" >&2;}
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (size_t), 77
-+See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
- esac
- else
- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5
--echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
- { (exit 1); exit 1; }; }
- else
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- long longval () { return (long) (sizeof (size_t)); }
- unsigned long ulongval () { return (long) (sizeof (size_t)); }
-@@ -24529,13 +26948,16 @@
- else
- echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77" >&5
--echo "$as_me: error: cannot compute sizeof (size_t), 77" >&2;}
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (size_t), 77
-+See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
- rm -f conftest.val
-@@ -24556,8 +26978,11 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -24572,11 +26997,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -24585,10 +27019,11 @@
- ac_cv_type_unsigned_long=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_type_unsigned_long=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
- echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6
-@@ -24606,8 +27041,11 @@
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -24621,11 +27059,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -24634,8 +27081,11 @@
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -24649,11 +27099,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -24662,22 +27121,27 @@
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_lo=`expr $ac_mid + 1`
-- if test $ac_lo -le $ac_mid; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid + 1`
-+ if test $ac_lo -le $ac_mid; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -24691,11 +27155,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -24704,8 +27177,11 @@
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -24719,11 +27195,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -24732,30 +27217,35 @@
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_hi=`expr '(' $ac_mid ')' - 1`
-- if test $ac_mid -le $ac_hi; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid`
-+ if test $ac_mid -le $ac_hi; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_lo= ac_hi=
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -24769,11 +27259,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -24782,26 +27281,32 @@
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77" >&5
--echo "$as_me: error: cannot compute sizeof (unsigned long), 77" >&2;}
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (unsigned long), 77
-+See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
- esac
- else
- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5
--echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
- { (exit 1); exit 1; }; }
- else
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- long longval () { return (long) (sizeof (unsigned long)); }
- unsigned long ulongval () { return (long) (sizeof (unsigned long)); }
-@@ -24849,13 +27354,16 @@
- else
- echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77" >&5
--echo "$as_me: error: cannot compute sizeof (unsigned long), 77" >&2;}
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (unsigned long), 77
-+See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
- rm -f conftest.val
-@@ -24874,8 +27382,11 @@
- echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5
- echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -24891,11 +27402,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -24905,7 +27425,8 @@
- echo "${ECHO_T}yes" >&6
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-
- echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
-@@ -24920,7 +27441,7 @@
- { (exit 1); exit 1; }; }
-
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
- # darwin needs this to initialize the environment
-@@ -24941,18 +27462,30 @@
- echo "$as_me:$LINENO: checking $ac_header usability" >&5
- echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -24961,10 +27494,11 @@
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6
-
-@@ -24972,8 +27506,11 @@
- echo "$as_me:$LINENO: checking $ac_header presence" >&5
- echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-@@ -24986,6 +27523,7 @@
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-@@ -24996,7 +27534,8 @@
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_header_preproc=no
- fi
- rm -f conftest.err conftest.$ac_ext
-@@ -25004,26 +27543,43 @@
- echo "${ECHO_T}$ac_header_preproc" >&6
-
- # So? What about this header?
--case $ac_header_compiler:$ac_header_preproc in
-- yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-- no:yes )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
- echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists. ##
-+## ------------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
- esac
- echo "$as_me:$LINENO: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- eval "$as_ac_Header=$ac_header_preproc"
-+ eval "$as_ac_Header=\$ac_header_preproc"
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-@@ -25044,43 +27600,72 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+/* Define _NSGetEnviron to an innocuous variant, in case <limits.h> declares _NSGetEnviron.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define _NSGetEnviron innocuous__NSGetEnviron
-+
- /* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char _NSGetEnviron (); below. */
--#include <assert.h>
-+ which can conflict with char _NSGetEnviron (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef _NSGetEnviron
-+
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
-+{
- #endif
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
- char _NSGetEnviron ();
--char (*f) ();
--
--int
--main ()
--{
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
- #if defined (__stub__NSGetEnviron) || defined (__stub____NSGetEnviron)
- choke me
- #else
--f = _NSGetEnviron;
-+char (*f) () = _NSGetEnviron;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
-
-+int
-+main ()
-+{
-+return f != _NSGetEnviron;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -25089,10 +27674,12 @@
- ac_cv_func__NSGetEnviron=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_func__NSGetEnviron=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
- echo "${ECHO_T}$ac_cv_func__NSGetEnviron" >&6
-@@ -25122,43 +27709,72 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below. */
--#include <assert.h>
-+ which can conflict with char $ac_func (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $ac_func
-+
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
-+{
- #endif
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
- char $ac_func ();
--char (*f) ();
--
--int
--main ()
--{
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
- #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
- choke me
- #else
--f = $ac_func;
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
-
-+int
-+main ()
-+{
-+return f != $ac_func;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -25167,10 +27783,12 @@
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -25262,8 +27880,11 @@
-
- # First, try using that file with no special directory specified.
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <$x_direct_test_include>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-@@ -25276,6 +27897,7 @@
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-@@ -25287,7 +27909,8 @@
- ac_x_includes=
- else
- echo "$as_me: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- # Look for the header file in a standard set of common directories.
- # Check X11 before X11Rn because it is often a symlink to the current release.
- for ac_dir in \
-@@ -25346,8 +27969,11 @@
- ac_save_LIBS="$LIBS"
- LIBS="-l$x_direct_test_library $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <X11/Intrinsic.h>
- int
- main ()
-@@ -25359,11 +27985,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -25374,7 +28009,8 @@
- ac_x_libraries=
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- LIBS="$ac_save_LIBS"
- # First see if replacing the include by lib works.
- # Check X11 before X11Rn because it is often a symlink to the current release.
-@@ -25423,7 +28059,8 @@
- done
- done
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- fi # $ac_x_libraries = NO
-
- case "$host" in
-@@ -25446,8 +28083,8 @@
- # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
- for ac_extension in a so sl; do
- if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
-- test -f $ac_im_libdir/libX11.$ac_extension; then
-- ac_im_usrlibdir=$ac_im_libdir; break
-+ test -f $ac_im_libdir/libX11.$ac_extension; then
-+ ac_im_usrlibdir=$ac_im_libdir; break
- fi
- done
- # Screen out bogus values from the imake configuration. They are
-@@ -25548,8 +28185,11 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lICE $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -25568,11 +28208,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -25581,10 +28230,12 @@
- ac_cv_lib_ICE_IceConnectionNumber=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_ICE_IceConnectionNumber=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-@@ -25610,8 +28261,11 @@
- LIBS="-lXext -lX11 $LIBSOCKET"
-
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <stdio.h>
- #ifdef STDC_HEADERS
-@@ -25630,11 +28284,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -25643,11 +28306,13 @@
- kde_cv_have_libXext=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- kde_cv_have_libXext=no
-
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-
- LDFLAGS=$kde_ldflags_safe
- LIBS=$kde_libs_safe
-@@ -25738,8 +28403,11 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-l$PTHREAD_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -25758,11 +28426,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -25771,10 +28448,12 @@
- eval "$as_ac_Lib=yes"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- eval "$as_ac_Lib=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-@@ -25799,8 +28478,11 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lpthread $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -25819,11 +28501,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -25832,10 +28523,12 @@
- ac_cv_lib_pthread_pthread_create=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_pthread_pthread_create=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
-@@ -25852,8 +28545,11 @@
- kde_safe_libs=$LIBS
- LIBS="$LIBS -lpthread"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <pthread.h>
- int
- main ()
-@@ -25865,11 +28561,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -25881,12 +28586,14 @@
- LIBPTHREAD="-lpthread"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-
- echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$kde_safe_libs
- fi
-
-@@ -25921,8 +28628,11 @@
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -pthread"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -25934,11 +28644,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -25947,9 +28666,11 @@
- eval "kde_cv_prog_cxx_$kde_cache=yes"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -26000,8 +28721,11 @@
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -mt"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -26013,11 +28737,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -26026,9 +28759,11 @@
- eval "kde_cv_prog_cxx_$kde_cache=yes"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -26151,8 +28886,11 @@
- kde_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include<zlib.h>
-
-@@ -26173,11 +28911,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -26186,10 +28933,12 @@
- eval "ac_cv_lib_z='-lz'"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- eval "ac_cv_lib_z=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS="$kde_save_LIBS"
- CFLAGS="$kde_save_CFLAGS"
-
-@@ -26238,8 +28987,11 @@
- CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include<png.h>
-
-@@ -26257,11 +29009,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -26270,11 +29031,13 @@
- eval "ac_cv_lib_png='-lpng $LIBZ -lm'"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- eval "ac_cv_lib_png=no"
-
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS="$kde_save_LIBS"
- CFLAGS="$kde_save_CFLAGS"
-
-@@ -26309,8 +29072,11 @@
- ac_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- /* Override any gcc2 internal prototype to avoid an error. */
- struct jpeg_decompress_struct;
- typedef struct jpeg_decompress_struct * j_decompress_ptr;
-@@ -26336,11 +29102,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -26349,10 +29124,12 @@
- eval "ac_cv_lib_jpeg_6b=-ljpeg6b"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- eval "ac_cv_lib_jpeg_6b=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS="$ac_save_LIBS"
- CFLAGS="$ac_save_CFLAGS"
-
-@@ -26378,8 +29155,11 @@
- ac_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- /* Override any gcc2 internal prototype to avoid an error. */
- struct jpeg_decompress_struct;
- typedef struct jpeg_decompress_struct * j_decompress_ptr;
-@@ -26405,11 +29185,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -26418,10 +29207,12 @@
- eval "ac_cv_lib_jpeg_normal=-ljpeg"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- eval "ac_cv_lib_jpeg_normal=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS="$ac_save_LIBS"
- CFLAGS="$ac_save_CFLAGS"
-
-@@ -26454,7 +29245,7 @@
+@@ -29295,7 +29447,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 26457: $i/$j" >&5
-+ echo "configure: 29248: $i/$j" >&5
+- echo "configure: 29298: $i/$j" >&5
++ echo "configure: 29450: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -26762,7 +29553,7 @@
+@@ -29593,7 +29745,7 @@
do
for j in $kde_qt_header;
do
-- echo "configure: 26765: $i/$j" >&5
-+ echo "configure: 29556: $i/$j" >&5
+- echo "configure: 29596: $i/$j" >&5
++ echo "configure: 29748: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -27413,8 +30204,11 @@
- ac_save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <qapplication.h>
- int
- main ()
-@@ -27429,11 +30223,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -27442,10 +30245,12 @@
- eval "kde_cv_qt_jpeg=no"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- eval "kde_cv_qt_jpeg=yes"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS="$ac_save_LIBS"
- CXXFLAGS="$ac_save_CXXFLAGS"
- ac_ext=c
-@@ -27584,7 +30389,7 @@
+@@ -30429,7 +30581,7 @@
do
for j in $kde_check_header;
do
-- echo "configure: 27587: $i/$j" >&5
-+ echo "configure: 30392: $i/$j" >&5
+- echo "configure: 30432: $i/$j" >&5
++ echo "configure: 30584: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -27614,7 +30419,7 @@
+@@ -30459,7 +30611,7 @@
do
for j in $kde_check_lib;
do
-- echo "configure: 27617: $i/$j" >&5
-+ echo "configure: 30422: $i/$j" >&5
+- echo "configure: 30462: $i/$j" >&5
++ echo "configure: 30614: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -27632,7 +30437,7 @@
+@@ -30477,7 +30629,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
-- echo "configure: 27635: $i/$j" >&5
-+ echo "configure: 30440: $i/$j" >&5
+- echo "configure: 30480: $i/$j" >&5
++ echo "configure: 30632: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -29134,7 +31939,7 @@
+@@ -31995,7 +32147,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
-- echo "configure: 29137: $i/$j" >&5
-+ echo "configure: 31942: $i/$j" >&5
+- echo "configure: 31998: $i/$j" >&5
++ echo "configure: 32150: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -29306,12 +32111,12 @@
- save_CXXFLAGS="$CXXFLAGS"
- kde_safe_LIBS="$LIBS"
- LIBS="$LIBS $X_EXTRA_LIBS"
--if test "$GXX" = "yes"; then
--CXXFLAGS="$CXXFLAGS -pedantic-errors"
--fi
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
+@@ -32178,7 +32330,7 @@
+ do
+ for j in qsql.html;
+ do
+- echo "configure: 32181: $i/$j" >&5
++ echo "configure: 32333: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ QTDOCDIR=$i
+@@ -32339,202 +32491,6 @@
+ #MIN_CONFIG(3.2)
- #include <stdlib.h>
-@@ -29329,11 +32134,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -29342,10 +32156,11 @@
- kde_cv_func_setenv=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- kde_cv_func_setenv=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
- LIBS="$kde_safe_LIBS"
- ac_ext=c
-@@ -29396,8 +32211,11 @@
- kde_safe_libs=$LIBS
- LIBS="$LIBS $X_EXTRA_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-
- #include <stdlib.h>
-@@ -29417,11 +32235,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -29431,11 +32258,13 @@
- kde_cv_proto_setenv=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- kde_cv_proto_setenv="setenv unavailable"
-
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$kde_safe_libs
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -29492,12 +32321,12 @@
- save_CXXFLAGS="$CXXFLAGS"
- kde_safe_LIBS="$LIBS"
- LIBS="$LIBS $X_EXTRA_LIBS"
--if test "$GXX" = "yes"; then
--CXXFLAGS="$CXXFLAGS -pedantic-errors"
--fi
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-
- #include <stdlib.h>
-@@ -29515,11 +32344,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -29528,10 +32366,11 @@
- kde_cv_func_unsetenv=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- kde_cv_func_unsetenv=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
- LIBS="$kde_safe_LIBS"
- ac_ext=c
-@@ -29582,8 +32421,11 @@
- kde_safe_libs=$LIBS
- LIBS="$LIBS $X_EXTRA_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-
- #include <stdlib.h>
-@@ -29603,11 +32445,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -29617,11 +32468,13 @@
- kde_cv_proto_unsetenv=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- kde_cv_proto_unsetenv="unsetenv unavailable"
-
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$kde_safe_libs
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -29674,8 +32527,11 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lm $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -29694,11 +32550,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -29707,10 +32572,12 @@
- ac_cv_lib_m_round=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_m_round=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_m_round" >&5
-@@ -29778,18 +32645,30 @@
- echo "$as_me:$LINENO: checking libkipi/interface.h usability" >&5
- echo $ECHO_N "checking libkipi/interface.h usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- #include <libkipi/interface.h>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -29798,10 +32677,11 @@
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6
-
-@@ -29809,8 +32689,11 @@
- echo "$as_me:$LINENO: checking libkipi/interface.h presence" >&5
- echo $ECHO_N "checking libkipi/interface.h presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <libkipi/interface.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-@@ -29823,6 +32706,7 @@
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_cxx_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
- else
- ac_cpp_err=
- fi
-@@ -29833,7 +32717,8 @@
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_header_preproc=no
- fi
- rm -f conftest.err conftest.$ac_ext
-@@ -29841,19 +32726,36 @@
- echo "${ECHO_T}$ac_header_preproc" >&6
-
- # So? What about this header?
--case $ac_header_compiler:$ac_header_preproc in
-- yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-+ yes:no: )
- { echo "$as_me:$LINENO: WARNING: libkipi/interface.h: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: libkipi/interface.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: libkipi/interface.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: libkipi/interface.h: proceeding with the preprocessor's result" >&2;};;
-- no:yes )
-+ { echo "$as_me:$LINENO: WARNING: libkipi/interface.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: libkipi/interface.h: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
- { echo "$as_me:$LINENO: WARNING: libkipi/interface.h: present but cannot be compiled" >&5
- echo "$as_me: WARNING: libkipi/interface.h: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: libkipi/interface.h: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: libkipi/interface.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: libkipi/interface.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: libkipi/interface.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: libkipi/interface.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: libkipi/interface.h: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: libkipi/interface.h: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: libkipi/interface.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: libkipi/interface.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: libkipi/interface.h: proceeding with the preprocessor's result" >&2;};;
-+echo "$as_me: WARNING: libkipi/interface.h: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: libkipi/interface.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: libkipi/interface.h: in the future, the compiler will take precedence" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists. ##
-+## ------------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
- esac
- echo "$as_me:$LINENO: checking for libkipi/interface.h" >&5
- echo $ECHO_N "checking for libkipi/interface.h... $ECHO_C" >&6
-@@ -29901,9 +32803,9 @@
- #
- # 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
-+
-
-
-
-@@ -29916,8 +32818,11 @@
- echo $ECHO_N "checking for assembler support for IA32 extensions... $ECHO_C" >&6
-
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -29929,11 +32834,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -29950,14 +32864,18 @@
-
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- echo $ECHO_N "MMX no$ECHO_C"
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -29969,11 +32887,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -29990,14 +32917,18 @@
-
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- echo $ECHO_N ", SSE no$ECHO_C"
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -30009,11 +32940,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -30030,14 +32970,18 @@
-
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- echo $ECHO_N ", SSE2 no$ECHO_C"
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -30049,11 +32993,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -30070,18 +33023,22 @@
-
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- echo $ECHO_N ", 3DNOW no$ECHO_C"
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- echo
- ;;
- powerpc )
- echo "$as_me:$LINENO: checking for assembler support for AltiVec instructions" >&5
- echo $ECHO_N "checking for assembler support for AltiVec instructions... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -30093,11 +33050,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -30114,10 +33080,11 @@
-
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- echo $ECHO_N ", AltiVec no$ECHO_C"
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- echo
- ;;
- esac
-@@ -30170,136 +33137,6 @@
-
-
-
+- if test "$GXX" = "yes"; then
-
--
--if test "x$desktopfiles_SUBDIR_included" = xyes; then
-- desktopfiles_SUBDIR_included_TRUE=
-- desktopfiles_SUBDIR_included_FALSE='#'
+-echo "$as_me:$LINENO: checking whether $CXX supports -fvisibility=hidden" >&5
+-echo $ECHO_N "checking whether $CXX supports -fvisibility=hidden... $ECHO_C" >&6
+-kde_cache=`echo fvisibility=hidden | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-- desktopfiles_SUBDIR_included_TRUE='#'
-- desktopfiles_SUBDIR_included_FALSE=
--fi
-
-
-
--if test "x$doc_SUBDIR_included" = xyes; then
-- doc_SUBDIR_included_TRUE=
-- doc_SUBDIR_included_FALSE='#'
--else
-- doc_SUBDIR_included_TRUE='#'
-- doc_SUBDIR_included_FALSE=
--fi
+- ac_ext=cc
+-ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
+-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
--if test "x$gvdirpart_SUBDIR_included" = xyes; then
-- gvdirpart_SUBDIR_included_TRUE=
-- gvdirpart_SUBDIR_included_FALSE='#'
+- save_CXXFLAGS="$CXXFLAGS"
+- CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-int
+-main ()
+-{
+- return 0;
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- eval "kde_cv_prog_cxx_$kde_cache=yes"
-else
-- gvdirpart_SUBDIR_included_TRUE='#'
-- gvdirpart_SUBDIR_included_FALSE=
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- CXXFLAGS="$save_CXXFLAGS"
+- ac_ext=cc
+-ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
--
--if test "x$gvimagepart_SUBDIR_included" = xyes; then
-- gvimagepart_SUBDIR_included_TRUE=
-- gvimagepart_SUBDIR_included_FALSE='#'
--else
-- gvimagepart_SUBDIR_included_TRUE='#'
-- gvimagepart_SUBDIR_included_FALSE=
-fi
-
+-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+- :
-
+- CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-
--if test "x$gvimageutils_SUBDIR_included" = xyes; then
-- gvimageutils_SUBDIR_included_TRUE=
-- gvimageutils_SUBDIR_included_FALSE='#'
+- echo "$as_me:$LINENO: checking for gcc -fvisibility-inlines-hidden bug" >&5
+-echo $ECHO_N "checking for gcc -fvisibility-inlines-hidden bug... $ECHO_C" >&6
+-if test "${kde_cv_val_gcc_visibility_bug+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-- gvimageutils_SUBDIR_included_TRUE='#'
-- gvimageutils_SUBDIR_included_FALSE=
--fi
-
-
-
--if test "x$gwenviewapp_SUBDIR_included" = xyes; then
-- gwenviewapp_SUBDIR_included_TRUE=
-- gwenviewapp_SUBDIR_included_FALSE='#'
--else
-- gwenviewapp_SUBDIR_included_TRUE='#'
-- gwenviewapp_SUBDIR_included_FALSE=
--fi
+- ac_ext=cc
+-ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
+-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
--if test "x$libgvcompat_SUBDIR_included" = xyes; then
-- libgvcompat_SUBDIR_included_TRUE=
-- libgvcompat_SUBDIR_included_FALSE='#'
--else
-- libgvcompat_SUBDIR_included_TRUE='#'
-- libgvcompat_SUBDIR_included_FALSE=
--fi
-
+- safe_CXXFLAGS=$CXXFLAGS
+- safe_LDFLAGS=$LDFLAGS
+- CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0"
+- LDFLAGS="$LDFLAGS -shared -fPIC"
-
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
-
--if test "x$libgvexif_SUBDIR_included" = xyes; then
-- libgvexif_SUBDIR_included_TRUE=
-- libgvexif_SUBDIR_included_FALSE='#'
+- /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */
+- #include <string>
+- int some_function( void ) __attribute__ ((visibility("default")));
+- int some_function( void )
+- {
+- std::string s("blafasel");
+- return 0;
+- }
+-
+-int
+-main ()
+-{
+-/* elvis is alive */
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- kde_cv_val_gcc_visibility_bug=no
-else
-- libgvexif_SUBDIR_included_TRUE='#'
-- libgvexif_SUBDIR_included_FALSE=
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-kde_cv_val_gcc_visibility_bug=yes
-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
-
+- CXXFLAGS=$safe_CXXFLAGS
+- LDFLAGS=$safe_LDFLAGS
+- ac_ext=cc
+-ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
--if test "x$pics_SUBDIR_included" = xyes; then
-- pics_SUBDIR_included_TRUE=
-- pics_SUBDIR_included_FALSE='#'
--else
-- pics_SUBDIR_included_TRUE='#'
-- pics_SUBDIR_included_FALSE=
+-
-fi
+-echo "$as_me:$LINENO: result: $kde_cv_val_gcc_visibility_bug" >&5
+-echo "${ECHO_T}$kde_cv_val_gcc_visibility_bug" >&6
-
+- if test x$kde_cv_val_gcc_visibility_bug = xno; then
+- CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
+- fi
-
-
--if test "x$po_SUBDIR_included" = xyes; then
-- po_SUBDIR_included_TRUE=
-- po_SUBDIR_included_FALSE='#'
--else
-- po_SUBDIR_included_TRUE='#'
-- po_SUBDIR_included_FALSE=
--fi
-
+- HAVE_GCC_VISIBILITY=1
-
+-cat >>confdefs.h <<_ACEOF
+-#define __KDE_HAVE_GCC_VISIBILITY "$HAVE_GCC_VISIBILITY"
+-_ACEOF
-
--if test "x$src_SUBDIR_included" = xyes; then
-- src_SUBDIR_included_TRUE=
-- src_SUBDIR_included_FALSE='#'
--else
-- src_SUBDIR_included_TRUE='#'
-- src_SUBDIR_included_FALSE=
--fi
-
--
--
--if test "x$tools_SUBDIR_included" = xyes; then
-- tools_SUBDIR_included_TRUE=
-- tools_SUBDIR_included_FALSE='#'
-else
-- tools_SUBDIR_included_TRUE='#'
-- tools_SUBDIR_included_FALSE=
--fi
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+- :
-
--
--
--if test "x$tsthread_SUBDIR_included" = xyes; then
-- tsthread_SUBDIR_included_TRUE=
-- tsthread_SUBDIR_included_FALSE='#'
--else
-- tsthread_SUBDIR_included_TRUE='#'
-- tsthread_SUBDIR_included_FALSE=
-fi
-
- ac_config_files="$ac_config_files Makefile"
+- fi
- ac_config_files="$ac_config_files desktopfiles/Makefile"
-@@ -30454,13 +33291,13 @@
- # `set' does not quote correctly, so add quotes (double-quote
- # substitution turns \\\\ into \\, and sed turns \\ into \).
- sed -n \
-- "s/'/'\\\\''/g;
-- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-+ "s/'/'\\\\''/g;
-+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
- ;;
- *)
- # `set' quotes correctly as required by POSIX, so do not add quotes.
- sed -n \
-- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
- ;;
- esac;
- } |
-@@ -30471,7 +33308,7 @@
- t end
- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
- : end' >>confcache
--if cmp -s $cache_file confcache; then :; else
-+if diff $cache_file confcache >/dev/null 2>&1; then :; else
- if test -w $cache_file; then
- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
- cat confcache >$cache_file
-@@ -30490,13 +33327,13 @@
- # trailing colons and then remove the whole line if VPATH becomes empty
- # (actually we leave an empty line to preserve line numbers).
- if test "x$srcdir" = x.; then
-- ac_vpsub='/^[ ]*VPATH[ ]*=/{
-+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
- s/:*\$(srcdir):*/:/;
- s/:*\${srcdir}:*/:/;
- s/:*@srcdir@:*/:/;
--s/^\([^=]*=[ ]*\):*/\1/;
-+s/^\([^=]*=[ ]*\):*/\1/;
- s/:*$//;
--s/^[^=]*=[ ]*$//;
-+s/^[^=]*=[ ]*$//;
- }'
- fi
-@@ -30507,7 +33344,7 @@
- for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
- # 1. Remove the extension, and $U if already installed.
- ac_i=`echo "$ac_i" |
-- sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-+ sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
- # 2. Add them.
- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-@@ -30517,6 +33354,13 @@
+
+@@ -32832,9 +32788,9 @@
+ #
+ # 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
++
+
+
+
+@@ -33897,6 +33853,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -29104,299 +18470,7 @@
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -30559,97 +33403,6 @@
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
--if test -z "${desktopfiles_SUBDIR_included_TRUE}" && test -z "${desktopfiles_SUBDIR_included_FALSE}"; then
-- { { echo "$as_me:$LINENO: error: conditional \"desktopfiles_SUBDIR_included\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"desktopfiles_SUBDIR_included\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
--fi
--if test -z "${doc_SUBDIR_included_TRUE}" && test -z "${doc_SUBDIR_included_FALSE}"; then
-- { { echo "$as_me:$LINENO: error: conditional \"doc_SUBDIR_included\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"doc_SUBDIR_included\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
--fi
--if test -z "${gvdirpart_SUBDIR_included_TRUE}" && test -z "${gvdirpart_SUBDIR_included_FALSE}"; then
-- { { echo "$as_me:$LINENO: error: conditional \"gvdirpart_SUBDIR_included\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"gvdirpart_SUBDIR_included\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
--fi
--if test -z "${gvimagepart_SUBDIR_included_TRUE}" && test -z "${gvimagepart_SUBDIR_included_FALSE}"; then
-- { { echo "$as_me:$LINENO: error: conditional \"gvimagepart_SUBDIR_included\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"gvimagepart_SUBDIR_included\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
--fi
--if test -z "${gvimageutils_SUBDIR_included_TRUE}" && test -z "${gvimageutils_SUBDIR_included_FALSE}"; then
-- { { echo "$as_me:$LINENO: error: conditional \"gvimageutils_SUBDIR_included\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"gvimageutils_SUBDIR_included\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
--fi
--if test -z "${gwenviewapp_SUBDIR_included_TRUE}" && test -z "${gwenviewapp_SUBDIR_included_FALSE}"; then
-- { { echo "$as_me:$LINENO: error: conditional \"gwenviewapp_SUBDIR_included\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"gwenviewapp_SUBDIR_included\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
--fi
--if test -z "${libgvcompat_SUBDIR_included_TRUE}" && test -z "${libgvcompat_SUBDIR_included_FALSE}"; then
-- { { echo "$as_me:$LINENO: error: conditional \"libgvcompat_SUBDIR_included\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"libgvcompat_SUBDIR_included\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
--fi
--if test -z "${libgvexif_SUBDIR_included_TRUE}" && test -z "${libgvexif_SUBDIR_included_FALSE}"; then
-- { { echo "$as_me:$LINENO: error: conditional \"libgvexif_SUBDIR_included\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"libgvexif_SUBDIR_included\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
--fi
--if test -z "${pics_SUBDIR_included_TRUE}" && test -z "${pics_SUBDIR_included_FALSE}"; then
-- { { echo "$as_me:$LINENO: error: conditional \"pics_SUBDIR_included\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"pics_SUBDIR_included\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
--fi
--if test -z "${po_SUBDIR_included_TRUE}" && test -z "${po_SUBDIR_included_FALSE}"; then
-- { { echo "$as_me:$LINENO: error: conditional \"po_SUBDIR_included\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"po_SUBDIR_included\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
--fi
--if test -z "${src_SUBDIR_included_TRUE}" && test -z "${src_SUBDIR_included_FALSE}"; then
-- { { echo "$as_me:$LINENO: error: conditional \"src_SUBDIR_included\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"src_SUBDIR_included\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
--fi
--if test -z "${tools_SUBDIR_included_TRUE}" && test -z "${tools_SUBDIR_included_FALSE}"; then
-- { { echo "$as_me:$LINENO: error: conditional \"tools_SUBDIR_included\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"tools_SUBDIR_included\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
--fi
--if test -z "${tsthread_SUBDIR_included_TRUE}" && test -z "${tsthread_SUBDIR_included_FALSE}"; then
-- { { echo "$as_me:$LINENO: error: conditional \"tsthread_SUBDIR_included\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"tsthread_SUBDIR_included\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
--fi
-
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
-@@ -30664,6 +33417,8 @@
- # configure, is in config.log if it exists.
-
- debug=false
-+ac_cs_recheck=false
-+ac_cs_silent=false
- SHELL=\${CONFIG_SHELL-$SHELL}
- _ACEOF
-
-@@ -30682,9 +33437,10 @@
- elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
- set -o posix
- fi
-+DUALCASE=1; export DUALCASE # for MKS sh
-
- # Support unset when possible.
--if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
- else
- as_unset=false
-@@ -30698,9 +33454,12 @@
- PS4='+ '
-
- # NLS nuisances.
--for as_var in LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES LC_TIME
-+for as_var in \
-+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+ LC_TELEPHONE LC_TIME
- do
-- if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
- $as_unset $as_var
-@@ -30744,15 +33503,15 @@
-
- # The user is always right.
- if test "${PATH_SEPARATOR+set}" != set; then
-- echo "#! /bin/sh" >conftest.sh
-- echo "exit 0" >>conftest.sh
-- chmod +x conftest.sh
-- if (PATH="/nonexistent;."; conftest.sh) >/dev/null 2>&1; then
-+ echo "#! /bin/sh" >conf$$.sh
-+ echo "exit 0" >>conf$$.sh
-+ chmod +x conf$$.sh
-+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
-- rm -f conftest.sh
-+ rm -f conf$$.sh
- fi
-
-
-@@ -30879,16 +33638,17 @@
- if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
- else
-+ test -d ./-p && rmdir ./-p
- as_mkdir_p=false
- fi
-
- as_executable_p="test -f"
-
- # Sed expression to map a string onto a valid CPP name.
--as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
-+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
- # Sed expression to map a string onto a valid variable name.
--as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
-+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
- # IFS
-@@ -30915,7 +33675,7 @@
- cat >&5 <<_CSEOF
-
- This file was extended by $as_me, which was
--generated by GNU Autoconf 2.54. Invocation command line was
-+generated by GNU Autoconf 2.59. Invocation command line was
-
- CONFIG_FILES = $CONFIG_FILES
- CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -30955,12 +33715,13 @@
-
- -h, --help print this help, then exit
- -V, --version print version number, then exit
-+ -q, --quiet do not print progress messages
- -d, --debug don't remove temporary files
- --recheck update $as_me by reconfiguring in the same conditions
- --file=FILE[:TEMPLATE]
-- instantiate the configuration file FILE
-+ instantiate the configuration file FILE
- --header=FILE[:TEMPLATE]
-- instantiate the configuration header FILE
-+ instantiate the configuration header FILE
-
- Configuration files:
- $config_files
-@@ -30977,11 +33738,10 @@
- cat >>$CONFIG_STATUS <<_ACEOF
- ac_cs_version="\\
- config.status
--configured by $0, generated by GNU Autoconf 2.54,
-+configured by $0, generated by GNU Autoconf 2.59,
- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
--Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
--Free Software Foundation, Inc.
-+Copyright (C) 2003 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it."
- srcdir=$srcdir
-@@ -31014,12 +33774,9 @@
- case $ac_option in
- # Handling of the options.
- _ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF
-- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-- echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
-- exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
--_ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF
-+ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+ ac_cs_recheck=: ;;
- --version | --vers* | -V )
- echo "$ac_cs_version"; exit 0 ;;
- --he | --h)
-@@ -31041,6 +33798,9 @@
- $ac_shift
- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
- ac_need_defaults=false;;
-+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+ | -silent | --silent | --silen | --sile | --sil | --si | --s)
-+ ac_cs_silent=: ;;
-
- # This is an error.
- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-@@ -31055,6 +33815,20 @@
- shift
- done
-
-+ac_configure_extra_args=
-+
-+if $ac_cs_silent; then
-+ exec 6>/dev/null
-+ ac_configure_extra_args="$ac_configure_extra_args --silent"
-+fi
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+if \$ac_cs_recheck; then
-+ echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-+ exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+fi
-+
- _ACEOF
-
- cat >>$CONFIG_STATUS <<_ACEOF
-@@ -31154,6 +33928,9 @@
- test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
- fi
-
-+# Have a temporary directory for convenience. Make it in the build tree
-+# simply because there is no reason to put it here, and in addition,
-+# creating and moving files from /tmp can sometimes cause problems.
- # Create a temporary directory, and hook for its removal unless debugging.
- $debug ||
- {
-@@ -31162,17 +33939,17 @@
- }
-
- # Create a (secure) tmp directory for tmp files.
--: ${TMPDIR=/tmp}
-+
- {
-- tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
-+ tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
- test -n "$tmp" && test -d "$tmp"
- } ||
- {
-- tmp=$TMPDIR/cs$$-$RANDOM
-+ tmp=./confstat$$-$RANDOM
- (umask 077 && mkdir $tmp)
- } ||
- {
-- echo "$me: cannot create a temporary directory in $TMPDIR" >&2
-+ echo "$me: cannot create a temporary directory in ." >&2
- { (exit 1); exit 1; }
- }
-
-@@ -31243,14 +34020,20 @@
+@@ -34640,14 +34603,20 @@
s, at AUTOMAKE@,$AUTOMAKE,;t t
s, at AUTOHEADER@,$AUTOHEADER,;t t
s, at MAKEINFO@,$MAKEINFO,;t t
@@ -29418,503 +18492,7 @@
s, at KDECONFIG@,$KDECONFIG,;t t
s, at kde_libs_prefix@,$kde_libs_prefix,;t t
s, at kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -31423,32 +34206,6 @@
- s, at CCASFLAGS@,$CCASFLAGS,;t t
- s, at GV_ASM_DEFS@,$GV_ASM_DEFS,;t t
- s, at TOPSUBDIRS@,$TOPSUBDIRS,;t t
--s, at desktopfiles_SUBDIR_included_TRUE@,$desktopfiles_SUBDIR_included_TRUE,;t t
--s, at desktopfiles_SUBDIR_included_FALSE@,$desktopfiles_SUBDIR_included_FALSE,;t t
--s, at doc_SUBDIR_included_TRUE@,$doc_SUBDIR_included_TRUE,;t t
--s, at doc_SUBDIR_included_FALSE@,$doc_SUBDIR_included_FALSE,;t t
--s, at gvdirpart_SUBDIR_included_TRUE@,$gvdirpart_SUBDIR_included_TRUE,;t t
--s, at gvdirpart_SUBDIR_included_FALSE@,$gvdirpart_SUBDIR_included_FALSE,;t t
--s, at gvimagepart_SUBDIR_included_TRUE@,$gvimagepart_SUBDIR_included_TRUE,;t t
--s, at gvimagepart_SUBDIR_included_FALSE@,$gvimagepart_SUBDIR_included_FALSE,;t t
--s, at gvimageutils_SUBDIR_included_TRUE@,$gvimageutils_SUBDIR_included_TRUE,;t t
--s, at gvimageutils_SUBDIR_included_FALSE@,$gvimageutils_SUBDIR_included_FALSE,;t t
--s, at gwenviewapp_SUBDIR_included_TRUE@,$gwenviewapp_SUBDIR_included_TRUE,;t t
--s, at gwenviewapp_SUBDIR_included_FALSE@,$gwenviewapp_SUBDIR_included_FALSE,;t t
--s, at libgvcompat_SUBDIR_included_TRUE@,$libgvcompat_SUBDIR_included_TRUE,;t t
--s, at libgvcompat_SUBDIR_included_FALSE@,$libgvcompat_SUBDIR_included_FALSE,;t t
--s, at libgvexif_SUBDIR_included_TRUE@,$libgvexif_SUBDIR_included_TRUE,;t t
--s, at libgvexif_SUBDIR_included_FALSE@,$libgvexif_SUBDIR_included_FALSE,;t t
--s, at pics_SUBDIR_included_TRUE@,$pics_SUBDIR_included_TRUE,;t t
--s, at pics_SUBDIR_included_FALSE@,$pics_SUBDIR_included_FALSE,;t t
--s, at po_SUBDIR_included_TRUE@,$po_SUBDIR_included_TRUE,;t t
--s, at po_SUBDIR_included_FALSE@,$po_SUBDIR_included_FALSE,;t t
--s, at src_SUBDIR_included_TRUE@,$src_SUBDIR_included_TRUE,;t t
--s, at src_SUBDIR_included_FALSE@,$src_SUBDIR_included_FALSE,;t t
--s, at tools_SUBDIR_included_TRUE@,$tools_SUBDIR_included_TRUE,;t t
--s, at tools_SUBDIR_included_FALSE@,$tools_SUBDIR_included_FALSE,;t t
--s, at tsthread_SUBDIR_included_TRUE@,$tsthread_SUBDIR_included_TRUE,;t t
--s, at tsthread_SUBDIR_included_FALSE@,$tsthread_SUBDIR_included_FALSE,;t t
- s, at LIBOBJS@,$LIBOBJS,;t t
- s, at LTLIBOBJS@,$LTLIBOBJS,;t t
- CEOF
-@@ -31480,9 +34237,9 @@
- (echo ':t
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
- if test -z "$ac_sed_cmds"; then
-- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-+ ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
- else
-- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-+ ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
- fi
- ac_sed_frag=`expr $ac_sed_frag + 1`
- ac_beg=$ac_end
-@@ -31500,21 +34257,21 @@
- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
- case $ac_file in
- - | *:- | *:-:* ) # input from stdin
-- cat >$tmp/stdin
-- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-+ cat >$tmp/stdin
-+ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
- * ) ac_file_in=$ac_file.in ;;
- esac
-
- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
- $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$ac_file" : 'X\(//\)[^/]' \| \
-- X"$ac_file" : 'X\(//\)$' \| \
-- X"$ac_file" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$ac_file" : 'X\(//\)[^/]' \| \
-+ X"$ac_file" : 'X\(//\)$' \| \
-+ X"$ac_file" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
- echo X"$ac_file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -31530,10 +34287,10 @@
- as_dirs="$as_dir $as_dirs"
- as_dir=`(dirname "$as_dir") 2>/dev/null ||
- $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$as_dir" : 'X\(//\)[^/]' \| \
-- X"$as_dir" : 'X\(//\)$' \| \
-- X"$as_dir" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$as_dir" : 'X\(//\)[^/]' \| \
-+ X"$as_dir" : 'X\(//\)$' \| \
-+ X"$as_dir" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
- echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -31571,12 +34328,45 @@
- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_builddir$srcdir ;;
- esac
--# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
--# absolute.
--ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
--ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
--ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
--ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
-+
-+# Do not use `cd foo && pwd` to compute absolute paths, because
-+# the directories may not exist.
-+case `pwd` in
-+.) ac_abs_builddir="$ac_dir";;
-+*)
-+ case "$ac_dir" in
-+ .) ac_abs_builddir=`pwd`;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_builddir=${ac_top_builddir}.;;
-+*)
-+ case ${ac_top_builddir}. in
-+ .) ac_abs_top_builddir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_srcdir=$ac_srcdir;;
-+*)
-+ case $ac_srcdir in
-+ .) ac_abs_srcdir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_srcdir=$ac_top_srcdir;;
-+*)
-+ case $ac_top_srcdir in
-+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-+ esac;;
-+esac
-
-
- case $INSTALL in
-@@ -31584,11 +34374,6 @@
- *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
- esac
-
-- if test x"$ac_file" != x-; then
-- { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
-- rm -f "$ac_file"
-- fi
- # Let's still pretend it is `configure' which instantiates (i.e., don't
- # use $as_me), people would be surprised to read:
- # /* config.h. Generated by config.status. */
-@@ -31598,7 +34383,7 @@
- configure_input="$ac_file. "
- fi
- configure_input=$configure_input"Generated from `echo $ac_file_in |
-- sed 's,.*/,,'` by configure."
-+ sed 's,.*/,,'` by configure."
-
- # First look for the input files in the build tree, otherwise in the
- # src tree.
-@@ -31607,26 +34392,32 @@
- case $f in
- -) echo $tmp/stdin ;;
- [\\/$]*)
-- # Absolute (can't be DOS-style, as IFS=:)
-- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-+ # Absolute (can't be DOS-style, as IFS=:)
-+ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
- { (exit 1); exit 1; }; }
-- echo $f;;
-+ echo "$f";;
- *) # Relative
-- if test -f "$f"; then
-- # Build tree
-- echo $f
-- elif test -f "$srcdir/$f"; then
-- # Source tree
-- echo $srcdir/$f
-- else
-- # /dev/null tree
-- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-+ if test -f "$f"; then
-+ # Build tree
-+ echo "$f"
-+ elif test -f "$srcdir/$f"; then
-+ # Source tree
-+ echo "$srcdir/$f"
-+ else
-+ # /dev/null tree
-+ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
- { (exit 1); exit 1; }; }
-- fi;;
-+ fi;;
- esac
- done` || { (exit 1); exit 1; }
-+
-+ if test x"$ac_file" != x-; then
-+ { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+ rm -f "$ac_file"
-+ fi
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- sed "$ac_vpsub
-@@ -31666,12 +34457,12 @@
- # NAME is the cpp macro being defined and VALUE is the value it is being given.
- #
- # ac_d sets the value in "#define NAME VALUE" lines.
--ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
--ac_dB='[ ].*$,\1#\2'
-+ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
-+ac_dB='[ ].*$,\1#\2'
- ac_dC=' '
- ac_dD=',;t'
- # ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
--ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
-+ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
- ac_uB='$,\1#\2define\3'
- ac_uC=' '
- ac_uD=',;t'
-@@ -31680,11 +34471,11 @@
- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
- case $ac_file in
- - | *:- | *:-:* ) # input from stdin
-- cat >$tmp/stdin
-- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-+ cat >$tmp/stdin
-+ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
- * ) ac_file_in=$ac_file.in ;;
- esac
-
-@@ -31698,28 +34489,29 @@
- case $f in
- -) echo $tmp/stdin ;;
- [\\/$]*)
-- # Absolute (can't be DOS-style, as IFS=:)
-- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-+ # Absolute (can't be DOS-style, as IFS=:)
-+ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
- { (exit 1); exit 1; }; }
-- echo $f;;
-+ # Do quote $f, to prevent DOS paths from being IFS'd.
-+ echo "$f";;
- *) # Relative
-- if test -f "$f"; then
-- # Build tree
-- echo $f
-- elif test -f "$srcdir/$f"; then
-- # Source tree
-- echo $srcdir/$f
-- else
-- # /dev/null tree
-- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-+ if test -f "$f"; then
-+ # Build tree
-+ echo "$f"
-+ elif test -f "$srcdir/$f"; then
-+ # Source tree
-+ echo "$srcdir/$f"
-+ else
-+ # /dev/null tree
-+ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
- { (exit 1); exit 1; }; }
-- fi;;
-+ fi;;
- esac
- done` || { (exit 1); exit 1; }
- # Remove the trailing spaces.
-- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
-+ sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
-
- _ACEOF
-
-@@ -31742,9 +34534,9 @@
- s,[\\$`],\\&,g
- t clear
- : clear
--s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
-+s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
- t end
--s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
-+s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
- : end
- _ACEOF
- # If some macros were called several times there might be several times
-@@ -31758,13 +34550,13 @@
- # example, in the case of _POSIX_SOURCE, which is predefined and required
- # on some systems where configure will not decide to define it.
- cat >>conftest.undefs <<\_ACEOF
--s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-+s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
- _ACEOF
-
- # Break up conftest.defines because some shells have a limit on the size
- # of here documents, and old seds have small limits too (100 cmds).
- echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
--echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
-+echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
- echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
- echo ' :' >>$CONFIG_STATUS
- rm -f conftest.tail
-@@ -31773,7 +34565,7 @@
- # Write a limited-size here document to $tmp/defines.sed.
- echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
- # Speed up: don't consider the non `#define' lines.
-- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
-+ echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
- # Work around the forget-to-reset-the-flag bug.
- echo 't clr' >>$CONFIG_STATUS
- echo ': clr' >>$CONFIG_STATUS
-@@ -31800,7 +34592,7 @@
- # Write a limited-size here document to $tmp/undefs.sed.
- echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
- # Speed up: don't consider the non `#undef'
-- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
-+ echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
- # Work around the forget-to-reset-the-flag bug.
- echo 't clr' >>$CONFIG_STATUS
- echo ': clr' >>$CONFIG_STATUS
-@@ -31828,16 +34620,16 @@
- cat $tmp/in >>$tmp/config.h
- rm -f $tmp/in
- if test x"$ac_file" != x-; then
-- if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-+ if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
- { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
- else
- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
- $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$ac_file" : 'X\(//\)[^/]' \| \
-- X"$ac_file" : 'X\(//\)$' \| \
-- X"$ac_file" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$ac_file" : 'X\(//\)[^/]' \| \
-+ X"$ac_file" : 'X\(//\)$' \| \
-+ X"$ac_file" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
- echo X"$ac_file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -31853,10 +34645,10 @@
- as_dirs="$as_dir $as_dirs"
- as_dir=`(dirname "$as_dir") 2>/dev/null ||
- $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$as_dir" : 'X\(//\)[^/]' \| \
-- X"$as_dir" : 'X\(//\)$' \| \
-- X"$as_dir" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$as_dir" : 'X\(//\)[^/]' \| \
-+ X"$as_dir" : 'X\(//\)$' \| \
-+ X"$as_dir" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
- echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -31888,10 +34680,10 @@
- done
- echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
- $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X$ac_file : 'X\(//\)[^/]' \| \
-- X$ac_file : 'X\(//\)$' \| \
-- X$ac_file : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X$ac_file : 'X\(//\)[^/]' \| \
-+ X$ac_file : 'X\(//\)$' \| \
-+ X$ac_file : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
- echo X$ac_file |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -31910,16 +34702,41 @@
- ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
- $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$ac_dest" : 'X\(//\)[^/]' \| \
-- X"$ac_dest" : 'X\(//\)$' \| \
-- X"$ac_dest" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$ac_dest" : 'X\(//\)[^/]' \| \
-+ X"$ac_dest" : 'X\(//\)$' \| \
-+ X"$ac_dest" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
- echo X"$ac_dest" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
-+ { if $as_mkdir_p; then
-+ mkdir -p "$ac_dir"
-+ else
-+ as_dir="$ac_dir"
-+ as_dirs=
-+ while test ! -d "$as_dir"; do
-+ as_dirs="$as_dir $as_dirs"
-+ as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$as_dir" : 'X\(//\)[^/]' \| \
-+ X"$as_dir" : 'X\(//\)$' \| \
-+ X"$as_dir" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
-+echo X"$as_dir" |
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+ /^X\(\/\/\)$/{ s//\1/; q; }
-+ /^X\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
-+ done
-+ test ! -n "$as_dirs" || mkdir $as_dirs
-+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-+ { (exit 1); exit 1; }; }; }
-+
- ac_builddir=.
-
- if test "$ac_dir" != .; then
-@@ -31945,12 +34762,45 @@
- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_builddir$srcdir ;;
- esac
--# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
--# absolute.
--ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
--ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
--ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
--ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
-+
-+# Do not use `cd foo && pwd` to compute absolute paths, because
-+# the directories may not exist.
-+case `pwd` in
-+.) ac_abs_builddir="$ac_dir";;
-+*)
-+ case "$ac_dir" in
-+ .) ac_abs_builddir=`pwd`;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_builddir=${ac_top_builddir}.;;
-+*)
-+ case ${ac_top_builddir}. in
-+ .) ac_abs_top_builddir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_srcdir=$ac_srcdir;;
-+*)
-+ case $ac_srcdir in
-+ .) ac_abs_srcdir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_srcdir=$ac_top_srcdir;;
-+*)
-+ case $ac_top_srcdir in
-+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-+ esac;;
-+esac
-
-
- { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-@@ -31968,10 +34818,10 @@
- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
- dirpart=`(dirname "$mf") 2>/dev/null ||
- $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$mf" : 'X\(//\)[^/]' \| \
-- X"$mf" : 'X\(//\)$' \| \
-- X"$mf" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$mf" : 'X\(//\)[^/]' \| \
-+ X"$mf" : 'X\(//\)$' \| \
-+ X"$mf" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
- echo X"$mf" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -31981,36 +34831,30 @@
+@@ -35469,27 +35438,21 @@
else
continue
fi
@@ -29955,86 +18533,25 @@
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
- fdir=`(dirname "$file") 2>/dev/null ||
- $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$file" : 'X\(//\)[^/]' \| \
-- X"$file" : 'X\(//\)$' \| \
-- X"$file" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$file" : 'X\(//\)[^/]' \| \
-+ X"$file" : 'X\(//\)$' \| \
-+ X"$file" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
- echo X"$file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -32026,10 +34870,10 @@
- as_dirs="$as_dir $as_dirs"
- as_dir=`(dirname "$as_dir") 2>/dev/null ||
- $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$as_dir" : 'X\(//\)[^/]' \| \
-- X"$as_dir" : 'X\(//\)$' \| \
-- X"$as_dir" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$as_dir" : 'X\(//\)[^/]' \| \
-+ X"$as_dir" : 'X\(//\)$' \| \
-+ X"$as_dir" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
- echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -32074,8 +34918,11 @@
- # need to make the FD available again.
- if test "$no_create" != yes; then
- ac_cs_success=:
-+ ac_config_status_args=
-+ test "$silent" = yes &&
-+ ac_config_status_args="$ac_config_status_args --quiet"
- exec 5>/dev/null
-- $SHELL $CONFIG_STATUS || ac_cs_success=false
-+ $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
- exec 5>>config.log
- # Use ||, not &&, to avoid exiting from the if with $? = 1, which
- # would make configure fail if this is the last instruction.
-diff -Nru gwenview-1.2.0.orig/configure.in gwenview-1.2.0/configure.in
---- gwenview-1.2.0.orig/configure.in 2005-04-03 13:18:11.000000000 +0000
-+++ gwenview-1.2.0/configure.in 2005-07-26 19:25:36.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/configure.in gwenview-1.3.0/configure.in
+--- gwenview-1.3.0.orig/configure.in 2005-09-11 10:39:24.000000000 -0400
++++ gwenview-1.3.0/configure.in 2005-09-12 08:41:28.000000000 -0400
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(gwenview-1.2.0, "3.3.92") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(gwenview-1.3.0, "3.4.89") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
KDE_SET_PREFIX
dnl generate the config header
-@@ -163,19 +165,6 @@
- GV_ASM_DEFS="$gv_asm_defs"
- AC_SUBST(GV_ASM_DEFS)
- KDE_CREATE_SUBDIRSLIST
--AM_CONDITIONAL(desktopfiles_SUBDIR_included, test "x$desktopfiles_SUBDIR_included" = xyes)
--AM_CONDITIONAL(doc_SUBDIR_included, test "x$doc_SUBDIR_included" = xyes)
--AM_CONDITIONAL(gvdirpart_SUBDIR_included, test "x$gvdirpart_SUBDIR_included" = xyes)
--AM_CONDITIONAL(gvimagepart_SUBDIR_included, test "x$gvimagepart_SUBDIR_included" = xyes)
--AM_CONDITIONAL(gvimageutils_SUBDIR_included, test "x$gvimageutils_SUBDIR_included" = xyes)
--AM_CONDITIONAL(gwenviewapp_SUBDIR_included, test "x$gwenviewapp_SUBDIR_included" = xyes)
--AM_CONDITIONAL(libgvcompat_SUBDIR_included, test "x$libgvcompat_SUBDIR_included" = xyes)
--AM_CONDITIONAL(libgvexif_SUBDIR_included, test "x$libgvexif_SUBDIR_included" = xyes)
--AM_CONDITIONAL(pics_SUBDIR_included, test "x$pics_SUBDIR_included" = xyes)
--AM_CONDITIONAL(po_SUBDIR_included, test "x$po_SUBDIR_included" = xyes)
--AM_CONDITIONAL(src_SUBDIR_included, test "x$src_SUBDIR_included" = xyes)
--AM_CONDITIONAL(tools_SUBDIR_included, test "x$tools_SUBDIR_included" = xyes)
--AM_CONDITIONAL(tsthread_SUBDIR_included, test "x$tsthread_SUBDIR_included" = xyes)
- AC_CONFIG_FILES([ Makefile ])
- AC_CONFIG_FILES([ desktopfiles/Makefile ])
- AC_CONFIG_FILES([ doc/Makefile ])
-diff -Nru gwenview-1.2.0.orig/desktopfiles/Makefile.in gwenview-1.2.0/desktopfiles/Makefile.in
---- gwenview-1.2.0.orig/desktopfiles/Makefile.in 2005-04-03 13:19:02.000000000 +0000
-+++ gwenview-1.2.0/desktopfiles/Makefile.in 2005-07-26 19:28:12.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/doc/Makefile.in gwenview-1.3.0/doc/Makefile.in
+--- gwenview-1.3.0.orig/doc/Makefile.in 2005-09-11 10:40:29.000000000 -0400
++++ gwenview-1.3.0/doc/Makefile.in 2005-09-12 08:43:46.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -30044,379 +18561,6 @@
# 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.
-@@ -22,7 +22,6 @@
- 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
-@@ -39,6 +38,32 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = desktopfiles
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_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)$(konqservicedir)" \
-+ "$(DESTDIR)$(xdg_appsdir)"
-+konqserviceDATA_INSTALL = $(INSTALL_DATA)
-+xdg_appsDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(konqservice_DATA) $(xdg_apps_DATA)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +136,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +175,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -205,6 +234,8 @@
- 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@
-@@ -212,19 +243,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +281,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -305,31 +311,54 @@
- # file for konqueror integration
- konqservicedir = $(kde_datadir)/konqueror/servicemenus
- konqservice_DATA = konqgwenview.desktop
--
- EXTRA_DIST = $(xdg_apps_DATA) $(konqservice_DATA)
--subdir = desktopfiles
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DATA = $(konqservice_DATA) $(xdg_apps_DATA)
--
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
- #>- all: all-am
- #>+ 1
- all: docs-am all-am
-
- .SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
-+#>- @for dep in $?; do \
-+#>- case '$(am__configure_deps)' in \
-+#>- *$$dep*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign desktopfiles/Makefile'; \
- #>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu desktopfiles/Makefile
--#>+ 3
-+#>- $(AUTOMAKE) --foreign desktopfiles/Makefile
-+#>+ 12
-+ @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) --foreign desktopfiles/Makefile'; \
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu desktopfiles/Makefile
-+ $(AUTOMAKE) --foreign desktopfiles/Makefile
- cd $(top_srcdir) && perl admin/am_edit desktopfiles/Makefile.in
--Makefile: $(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
-@@ -340,41 +369,39 @@
- distclean-libtool:
- -rm -f libtool
- uninstall-info-am:
--konqserviceDATA_INSTALL = $(INSTALL_DATA)
- install-konqserviceDATA: $(konqservice_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(konqservicedir)
-+ test -z "$(konqservicedir)" || $(mkdir_p) "$(DESTDIR)$(konqservicedir)"
- @list='$(konqservice_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(konqserviceDATA_INSTALL) $$d$$p $(DESTDIR)$(konqservicedir)/$$f"; \
-- $(konqserviceDATA_INSTALL) $$d$$p $(DESTDIR)$(konqservicedir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(konqserviceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(konqservicedir)/$$f'"; \
-+ $(konqserviceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(konqservicedir)/$$f"; \
- done
-
- uninstall-konqserviceDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(konqservice_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(konqservicedir)/$$f"; \
-- rm -f $(DESTDIR)$(konqservicedir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(konqservicedir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(konqservicedir)/$$f"; \
- done
--xdg_appsDATA_INSTALL = $(INSTALL_DATA)
- install-xdg_appsDATA: $(xdg_apps_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(xdg_appsdir)
-+ test -z "$(xdg_appsdir)" || $(mkdir_p) "$(DESTDIR)$(xdg_appsdir)"
- @list='$(xdg_apps_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(xdg_appsDATA_INSTALL) $$d$$p $(DESTDIR)$(xdg_appsdir)/$$f"; \
-- $(xdg_appsDATA_INSTALL) $$d$$p $(DESTDIR)$(xdg_appsdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(xdg_appsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xdg_appsdir)/$$f'"; \
-+ $(xdg_appsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xdg_appsdir)/$$f"; \
- done
-
- uninstall-xdg_appsDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(xdg_apps_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(xdg_appsdir)/$$f"; \
-- rm -f $(DESTDIR)$(xdg_appsdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(xdg_appsdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(xdg_appsdir)/$$f"; \
- done
- tags: TAGS
- TAGS:
-@@ -382,12 +409,6 @@
- ctags: CTAGS
- CTAGS:
-
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -401,7 +422,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -419,9 +440,10 @@
- check-am: all-am
- check: check-am
- all-am: Makefile $(DATA)
--
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(konqservicedir) $(DESTDIR)$(xdg_appsdir)
-+ for dir in "$(DESTDIR)$(konqservicedir)" "$(DESTDIR)$(xdg_appsdir)"; do \
-+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ done
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -441,7 +463,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"
-@@ -462,6 +484,8 @@
-
- dvi-am:
-
-+html: html-am
-+
- info: info-am
-
- info-am:
-@@ -497,29 +521,39 @@
-
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
-- dvi-am info info-am install install-am install-data \
-- install-data-am install-exec install-exec-am install-info \
-- install-info-am install-konqserviceDATA install-man \
-- install-strip install-xdg_appsDATA installcheck installcheck-am \
-- installdirs maintainer-clean maintainer-clean-generic \
-- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-- ps ps-am uninstall uninstall-am uninstall-info-am \
-- uninstall-konqserviceDATA uninstall-xdg_appsDATA
-+ dvi-am html html-am info info-am install install-am \
-+ install-data install-data-am install-exec install-exec-am \
-+ install-info install-info-am install-konqserviceDATA \
-+ install-man install-strip install-xdg_appsDATA installcheck \
-+ installcheck-am installdirs maintainer-clean \
-+ maintainer-clean-generic mostlyclean mostlyclean-generic \
-+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-+ uninstall-info-am uninstall-konqserviceDATA \
-+ uninstall-xdg_appsDATA
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=Makefile.in gwenview.desktop konqgwenview.desktop
-+KDE_DIST=Makefile.in gwenview.desktop konqgwenview.desktop Makefile.am
-
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu desktopfiles/Makefile
-+ @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) --foreign desktopfiles/Makefile'; \
-+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign desktopfiles/Makefile
- cd $(top_srcdir) && perl admin/am_edit desktopfiles/Makefile.in
-
-
-diff -Nru gwenview-1.2.0.orig/doc/gwenview/Makefile.in gwenview-1.2.0/doc/gwenview/Makefile.in
---- gwenview-1.2.0.orig/doc/gwenview/Makefile.in 2005-04-03 13:19:02.000000000 +0000
-+++ gwenview-1.2.0/doc/gwenview/Makefile.in 2005-07-26 19:28:12.000000000 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @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 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
@@ -14,7 +14,6 @@
# PARTICULAR PURPOSE.
@@ -30428,7 +18572,7 @@
@@ -22,7 +21,6 @@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
+ top_builddir = ..
-
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
@@ -30437,7 +18581,7 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = doc/gwenview
++subdir = doc
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -30455,15 +18599,7 @@
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +124,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +163,9 @@
+@@ -164,6 +177,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -30473,7 +18609,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +222,8 @@
+@@ -222,6 +238,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -30482,71 +18618,19 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +231,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +269,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +291,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,30 +292,55 @@
- xdg_appsdir = @xdg_appsdir@
- xdg_directorydir = @xdg_directorydir@
+@@ -299,27 +318,53 @@
xdg_menudir = @xdg_menudir@
--
KDE_LANG = en
- KDE_DOCS = AUTO
--subdir = doc/gwenview
+ KDE_DOCS = gwenview
+-subdir = doc
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -30568,11 +18652,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/gwenview/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu doc/gwenview/Makefile
+-#>- $(AUTOMAKE) --gnu doc/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign doc/gwenview/Makefile
++#>- $(AUTOMAKE) --foreign doc/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -30582,11 +18666,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/gwenview/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu doc/gwenview/Makefile
-+ $(AUTOMAKE) --foreign doc/gwenview/Makefile
- cd $(top_srcdir) && perl admin/am_edit doc/gwenview/Makefile.in
+- $(AUTOMAKE) --gnu doc/Makefile
++ $(AUTOMAKE) --foreign doc/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -30609,7 +18693,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -338,12 +357,6 @@
+@@ -336,12 +381,6 @@
ctags: CTAGS
CTAGS:
@@ -30617,12 +18701,12 @@
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -359,7 +372,7 @@
+@@ -357,7 +396,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -30631,7 +18715,7 @@
else \
dir=''; \
fi; \
-@@ -377,7 +390,6 @@
+@@ -375,7 +414,6 @@
check-am: all-am
check: check-am
all-am: Makefile
@@ -30639,7 +18723,7 @@
installdirs:
install: install-am
install-exec: install-exec-am
-@@ -400,7 +412,7 @@
+@@ -398,7 +436,7 @@
clean-generic:
distclean-generic:
@@ -30648,7 +18732,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -421,6 +433,8 @@
+@@ -419,6 +457,8 @@
dvi-am:
@@ -30657,7 +18741,7 @@
info: info-am
info-am:
-@@ -457,10 +471,10 @@
+@@ -455,10 +495,10 @@
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
@@ -30672,40 +18756,40 @@
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
uninstall-info-am
-@@ -470,10 +484,10 @@
+@@ -468,10 +508,10 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=dock_grip.png Makefile.in mouse.html view_mode.png browse_mode.png keybindings.html external_tools_dialog.png introduction.html introduction.docbook mouse.docbook index.html external_tools.html index.docbook docked_windows.docbook interface.docbook interface.html external_tools.docbook tips.html docked_windows.html keybindings.docbook
-+KDE_DIST=dock_grip.png Makefile.in mouse.html view_mode.png browse_mode.png keybindings.html external_tools_dialog.png introduction.html index.html introduction.docbook mouse.docbook index.docbook external_tools.html docked_windows.docbook interface.docbook interface.html external_tools.docbook tips.html Makefile.am docked_windows.html keybindings.docbook
+-KDE_DIST=dock_grip.png Makefile.in view_mode.png browse_mode.png mouse.docbook external_tools_dialog.png introduction.docbook index.docbook docked_windows.docbook interface.docbook external_tools.docbook keybindings.docbook
++KDE_DIST=dock_grip.png Makefile.in view_mode.png browse_mode.png external_tools_dialog.png introduction.docbook mouse.docbook index.docbook docked_windows.docbook interface.docbook external_tools.docbook Makefile.am keybindings.docbook
#>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.html index.docbook interface.html mouse.docbook introduction.docbook introduction.html docked_windows.html mouse.html interface.docbook keybindings.docbook keybindings.html external_tools.docbook tips.html external_tools_dialog.png browse_mode.png view_mode.png dock_grip.png docked_windows.docbook external_tools.html
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) docked_windows.html mouse.docbook keybindings.html interface.html browse_mode.png external_tools.docbook docked_windows.docbook introduction.docbook external_tools.html index.html introduction.html dock_grip.png interface.docbook tips.html view_mode.png index.docbook keybindings.docbook mouse.html external_tools_dialog.png
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) external_tools.docbook interface.docbook introduction.docbook keybindings.docbook view_mode.png dock_grip.png docked_windows.docbook external_tools_dialog.png index.docbook mouse.docbook browse_mode.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) mouse.docbook browse_mode.png external_tools.docbook docked_windows.docbook introduction.docbook dock_grip.png interface.docbook view_mode.png index.docbook keybindings.docbook external_tools_dialog.png
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -500,27 +514,36 @@
+@@ -498,27 +538,36 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview
-- @for base in index.html index.docbook interface.html mouse.docbook introduction.docbook introduction.html docked_windows.html mouse.html interface.docbook keybindings.docbook keybindings.html external_tools.docbook tips.html external_tools_dialog.png browse_mode.png view_mode.png dock_grip.png docked_windows.docbook external_tools.html ; do \
-+ @for base in docked_windows.html mouse.docbook keybindings.html interface.html browse_mode.png external_tools.docbook docked_windows.docbook introduction.docbook external_tools.html index.html introduction.html dock_grip.png interface.docbook tips.html view_mode.png index.docbook keybindings.docbook mouse.html external_tools_dialog.png ; do \
+- @for base in external_tools.docbook interface.docbook introduction.docbook keybindings.docbook view_mode.png dock_grip.png docked_windows.docbook external_tools_dialog.png index.docbook mouse.docbook browse_mode.png ; do \
++ @for base in mouse.docbook browse_mode.png external_tools.docbook docked_windows.docbook introduction.docbook dock_grip.png interface.docbook view_mode.png index.docbook keybindings.docbook external_tools_dialog.png ; do \
echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
$(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
done
uninstall-nls:
-- for base in index.html index.docbook interface.html mouse.docbook introduction.docbook introduction.html docked_windows.html mouse.html interface.docbook keybindings.docbook keybindings.html external_tools.docbook tips.html external_tools_dialog.png browse_mode.png view_mode.png dock_grip.png docked_windows.docbook external_tools.html ; do \
-+ for base in docked_windows.html mouse.docbook keybindings.html interface.html browse_mode.png external_tools.docbook docked_windows.docbook introduction.docbook external_tools.html index.html introduction.html dock_grip.png interface.docbook tips.html view_mode.png index.docbook keybindings.docbook mouse.html external_tools_dialog.png ; do \
+- for base in external_tools.docbook interface.docbook introduction.docbook keybindings.docbook view_mode.png dock_grip.png docked_windows.docbook external_tools_dialog.png index.docbook mouse.docbook browse_mode.png ; do \
++ for base in mouse.docbook browse_mode.png external_tools.docbook docked_windows.docbook introduction.docbook dock_grip.png interface.docbook view_mode.png index.docbook keybindings.docbook external_tools_dialog.png ; do \
rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
done
#>+ 5
distdir-nls:
-- for file in index.html index.docbook interface.html mouse.docbook introduction.docbook introduction.html docked_windows.html mouse.html interface.docbook keybindings.docbook keybindings.html external_tools.docbook tips.html external_tools_dialog.png browse_mode.png view_mode.png dock_grip.png docked_windows.docbook external_tools.html ; do \
-+ for file in docked_windows.html mouse.docbook keybindings.html interface.html browse_mode.png external_tools.docbook docked_windows.docbook introduction.docbook external_tools.html index.html introduction.html dock_grip.png interface.docbook tips.html view_mode.png index.docbook keybindings.docbook mouse.html external_tools_dialog.png ; do \
+- for file in external_tools.docbook interface.docbook introduction.docbook keybindings.docbook view_mode.png dock_grip.png docked_windows.docbook external_tools_dialog.png index.docbook mouse.docbook browse_mode.png ; do \
++ for file in mouse.docbook browse_mode.png external_tools.docbook docked_windows.docbook introduction.docbook dock_grip.png interface.docbook view_mode.png index.docbook keybindings.docbook external_tools_dialog.png ; do \
cp $(srcdir)/$$file $(distdir); \
done
@@ -30713,7 +18797,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu doc/gwenview/Makefile
+- $(AUTOMAKE) --gnu doc/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -30722,19 +18806,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/gwenview/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign doc/gwenview/Makefile
- cd $(top_srcdir) && perl admin/am_edit doc/gwenview/Makefile.in
++ $(AUTOMAKE) --foreign doc/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/Makefile.in
-diff -Nru gwenview-1.2.0.orig/doc/Makefile.in gwenview-1.2.0/doc/Makefile.in
---- gwenview-1.2.0.orig/doc/Makefile.in 2005-04-03 13:19:02.000000000 +0000
-+++ gwenview-1.2.0/doc/Makefile.in 2005-07-26 19:28:12.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/Makefile.in gwenview-1.3.0/Makefile.in
+--- gwenview-1.3.0.orig/Makefile.in 2005-09-11 10:40:29.000000000 -0400
++++ gwenview-1.3.0/Makefile.in 2005-09-12 08:43:46.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -30744,35 +18828,43 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
+@@ -16,7 +16,6 @@
+ @SET_MAKE@
- @SET_MAKE@
+ # COMPILE_BEFORE_digikamimageplugins = digikam
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -22,7 +21,6 @@
+@@ -24,7 +23,6 @@
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
-@@ -39,6 +37,41 @@
+@@ -41,6 +39,55 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = doc
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
++ $(srcdir)/Makefile.in $(srcdir)/admin/Doxyfile.am \
++ $(srcdir)/admin/deps.am $(srcdir)/config.h.in \
++ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
++ TODO admin/compile admin/config.guess admin/config.sub \
++ admin/depcomp admin/install-sh admin/ltmain.sh admin/missing \
++ admin/mkinstalldirs admin/ylwrap
++subdir = .
+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)
++am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
++ configure.lineno configure.status.lineno
+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
@@ -30789,28 +18881,26 @@
+ install-recursive installcheck-recursive installdirs-recursive \
+ pdf-recursive ps-recursive uninstall-info-recursive \
+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+man1dir = $(mandir)/man1
-+am__installdirs = "$(DESTDIR)$(man1dir)"
-+NROFF = nroff
-+MANS = $(man_MANS)
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++distdir = $(PACKAGE)-$(VERSION)
++top_distdir = $(distdir)
++am__remove_distdir = \
++ { test ! -d $(distdir) \
++ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
++ && rm -fr $(distdir); }; }
++DIST_ARCHIVES = $(distdir).tar.gz
++GZIP_ENV = --best
++distuninstallcheck_listfiles = find . -type f -print
++distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +144,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +183,9 @@
+@@ -166,6 +213,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -30820,7 +18910,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +242,8 @@
+@@ -224,6 +274,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -30829,77 +18919,28 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +251,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +289,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -275,6 +327,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -300,43 +314,53 @@
+@@ -299,63 +352,64 @@
+ xdg_appsdir = @xdg_appsdir@
+ xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
- man_MANS = gwenview.1
- SUBDIRS = gwenview
--subdir = doc
+-
+ AUTOMAKE_OPTIONS = foreign 1.5
+ SUBDIRS = $(TOPSUBDIRS)
+-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-
--NROFF = nroff
--MANS = $(man_MANS)
--
-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-#>- ps-recursive install-info-recursive uninstall-info-recursive \
-#>- all-recursive install-data-recursive install-exec-recursive \
@@ -30911,100 +18952,99 @@
- all-recursive install-data-recursive install-exec-recursive \
- installdirs-recursive install-recursive uninstall-recursive \
- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/admin/Doxyfile.am \
+- $(srcdir)/admin/deps.am $(srcdir)/configure AUTHORS COPYING \
+- ChangeLog INSTALL Makefile.am NEWS TODO acinclude.m4 aclocal.m4 \
+- admin/compile admin/config.guess admin/config.sub admin/depcomp \
+- admin/install-sh admin/ltmain.sh admin/missing \
+- admin/mkinstalldirs admin/ylwrap config.h.in configure \
+- configure.in
-DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
+ #>- all: config.h
#>+ 1
- all: docs-am all-recursive
+ all: docs-am config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+-
+-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+- configure.lineno
+-$(srcdir)/Makefile.in: Makefile.am $(srcdir)/admin/deps.am $(srcdir)/admin/Doxyfile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++am--refresh:
++ @:
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(srcdir)/admin/Doxyfile.am $(am__configure_deps)
+#>- @for dep in $?; do \
+#>- case '$(am__configure_deps)' in \
+#>- *$$dep*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
++#>- cd $(srcdir) && $(AUTOMAKE) --foreign \
+#>- && exit 0; \
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu doc/Makefile
+ #>- $(AUTOMAKE) --foreign Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign doc/Makefile
-+#>+ 12
++#>+ 14
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
++ ( \
++ cd $(srcdir) && $(AUTOMAKE) --foreign \
++ ) || exit 1; echo ' cd $(top_srcdir) && perl admin/am_edit '; cd $(top_srcdir) && perl admin/am_edit && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu doc/Makefile
-+ $(AUTOMAKE) --foreign doc/Makefile
- cd $(top_srcdir) && perl admin/am_edit doc/Makefile.in
+ $(AUTOMAKE) --foreign Makefile
+ cd $(top_srcdir) && perl admin/am_edit Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+- cd $(top_builddir) && $(SHELL) ./config.status $@ $(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 ' $(SHELL) ./config.status'; \
++ $(SHELL) ./config.status;; \
+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
++ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+ esac;
-+
+
+-$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ $(SHELL) ./config.status --recheck
+-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ #>- cd $(srcdir) && $(AUTOCONF)
+ #>+ 2
+ cd $(srcdir) && rm -f configure
+ cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure
+-
+-$(ACLOCAL_M4): configure.in acinclude.m4
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -347,11 +371,9 @@
- distclean-libtool:
- -rm -f libtool
- uninstall-info-am:
+ config.h: stamp-h1
+@@ -367,10 +421,10 @@
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+ @rm -f stamp-h1
+ cd $(top_builddir) && $(SHELL) ./config.status config.h
-
--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 \
-@@ -370,8 +392,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)
-@@ -391,8 +413,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
+-$(srcdir)/config.h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_srcdir) && $(AUTOHEADER)
+- touch $(srcdir)/config.h.in
++ rm -f stamp-h1
++ touch $@
- # This directory's subdirectories are mostly independent; you can cd
-@@ -402,7 +424,13 @@
+ distclean-hdr:
+ -rm -f config.h stamp-h1
+@@ -392,7 +446,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):
@@ -31019,7 +19059,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -414,7 +442,7 @@
+@@ -404,7 +464,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -31028,7 +19068,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -422,7 +450,13 @@
+@@ -412,7 +472,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -31043,7 +19083,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -443,7 +477,7 @@
+@@ -433,7 +499,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -31052,7 +19092,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -454,14 +488,6 @@
+@@ -444,14 +510,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -31067,13 +19107,13 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -470,19 +496,22 @@
+@@ -460,19 +518,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
+tags: TAGS
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
@@ -31092,7 +19132,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -492,10 +521,11 @@
+@@ -482,10 +543,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -31106,9 +19146,9 @@
+ $$tags $$unique; \
+ fi
ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -518,12 +548,6 @@
+@@ -508,26 +570,11 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -31116,12 +19156,27 @@
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+-top_distdir = .
+-distdir = $(PACKAGE)-$(VERSION)
+-
+-am__remove_distdir = \
+- { test ! -d $(distdir) \
+- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+- && rm -fr $(distdir); }; }
+-
+-GZIP_ENV = --best
+-distuninstallcheck_listfiles = find . -type f -print
+-distcleancheck_listfiles = find . -type f -print
distdir: $(DISTFILES)
+ $(am__remove_distdir)
+ mkdir $(distdir)
+- $(mkinstalldirs) $(distdir)/./admin $(distdir)/admin
++ $(mkdir_p) $(distdir)/admin
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -537,7 +561,7 @@
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+@@ -539,7 +586,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -31130,7 +19185,7 @@
else \
dir=''; \
fi; \
-@@ -552,15 +576,17 @@
+@@ -554,15 +601,17 @@
|| exit 1; \
fi; \
done
@@ -31153,19 +19208,92 @@
distdir) \
|| exit 1; \
fi; \
-@@ -570,8 +596,9 @@
- all-am: Makefile $(MANS)
+@@ -573,19 +622,46 @@
+ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+ || chmod -R a+r $(distdir)
+ dist-gzip: distdir
+- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
++ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
++ $(am__remove_distdir)
++
++dist-bzip2: distdir
++ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
++ $(am__remove_distdir)
++
++dist-tarZ: distdir
++ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
++ $(am__remove_distdir)
++
++dist-shar: distdir
++ shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
++ $(am__remove_distdir)
++
++dist-zip: distdir
++ -rm -f $(distdir).zip
++ zip -rq $(distdir).zip $(distdir)
+ $(am__remove_distdir)
+
+ dist dist-all: distdir
+- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
++ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(am__remove_distdir)
+
+ # This target untars the dist file and tries a VPATH configuration. Then
+ # it guarantees that the distribution is self-contained by making another
+ # tarfile.
+ distcheck: dist
+- $(am__remove_distdir)
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
++ case '$(DIST_ARCHIVES)' in \
++ *.tar.gz*) \
++ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
++ *.tar.bz2*) \
++ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
++ *.tar.Z*) \
++ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
++ *.shar.gz*) \
++ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
++ *.zip*) \
++ unzip $(distdir).zip ;;\
++ esac
+ chmod -R a-w $(distdir); chmod a+w $(distdir)
+ mkdir $(distdir)/_build
+ mkdir $(distdir)/_inst
+@@ -605,19 +681,20 @@
+ distuninstallcheck \
+ && chmod -R a-w "$$dc_install_base" \
+ && ({ \
+- (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
++ (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+ } || { rm -rf "$$dc_destdir"; exit 1; }) \
+ && rm -rf "$$dc_destdir" \
+- && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
+- && rm -f $(distdir).tar.gz \
++ && $(MAKE) $(AM_MAKEFLAGS) dist \
++ && rm -rf $(DIST_ARCHIVES) \
+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+ $(am__remove_distdir)
+- @echo "$(distdir).tar.gz is ready for distribution" | \
+- sed 'h;s/./=/g;p;x;p;x'
++ @(echo "$(distdir) archives ready for distribution: "; \
++ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
++ sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+ distuninstallcheck:
+ @cd $(distuninstallcheck_dir) \
+ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+@@ -641,7 +718,6 @@
+ all-am: Makefile config.h
installdirs: installdirs-recursive
installdirs-am:
-- $(mkinstalldirs) $(DESTDIR)$(man1dir)
-
-+ for dir in "$(DESTDIR)$(man1dir)"; do \
-+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ done
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -591,7 +618,7 @@
+@@ -661,7 +737,7 @@
clean-generic:
distclean-generic:
@@ -31174,8 +19302,17 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -613,6 +640,8 @@
+@@ -677,13 +753,15 @@
+ distclean: distclean-recursive
+ -rm -f $(am__CONFIG_DISTCLEAN_FILES)
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \
+- distclean-tags
++distclean-am: clean-am distclean-generic distclean-hdr \
++ distclean-libtool distclean-tags
+ dvi: dvi-recursive
+
dvi-am:
+html: html-recursive
@@ -31183,76 +19320,72 @@
info: info-recursive
info-am:
-@@ -649,38 +678,43 @@
+@@ -720,24 +798,21 @@
- uninstall-man: uninstall-man1
+ uninstall-info: uninstall-info-recursive
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- install-data install-data-am install-data-recursive \
-- install-exec install-exec-am install-exec-recursive \
-- install-info install-info-am install-info-recursive install-man \
-- install-man1 install-recursive install-strip installcheck \
-- installcheck-am installdirs installdirs-am \
-- installdirs-recursive maintainer-clean maintainer-clean-generic \
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-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-man1 install-strip \
-+ installcheck installcheck-am installdirs installdirs-am \
-+ maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
+- ctags-recursive dist dist-all dist-gzip distcheck distclean \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
++ check-am clean clean-generic clean-libtool clean-recursive \
++ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
++ dist-shar dist-tarZ dist-zip distcheck distclean \
+ distclean-generic distclean-hdr distclean-libtool \
+ distclean-recursive distclean-tags distcleancheck distdir \
+- distuninstallcheck dvi dvi-am dvi-recursive info info-am \
+- info-recursive install install-am install-data install-data-am \
+- install-data-local 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-man uninstall-man1 \
-- uninstall-recursive
-+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-+ tags tags-recursive uninstall uninstall-am uninstall-info-am \
-+ uninstall-man uninstall-man1
+- uninstall-info-recursive uninstall-local uninstall-recursive
++ distuninstallcheck dvi dvi-am html html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am uninstall-local
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
+ $(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in $(top_srcdir)/admin/cvs.sh $(top_srcdir)/admin/pkg.m4.in
+ @cd $(top_srcdir) && $(SHELL) admin/cvs.sh acinclude_m4
+@@ -850,15 +925,16 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=Makefile.in gwenview.1
-+KDE_DIST=Makefile.in gwenview.1 Makefile.am
+-KDE_DIST=Mainpage.dox subdirs Makefile.in configure.in.bot configure.files Makefile.am.in.wo Makefile.cvs configure.in.in Makefile.am.in
++KDE_DIST=stamp-h.in Mainpage.dox subdirs Makefile.in configure.in.bot configure.files config.h.in Makefile.am.in.wo configure.in Makefile.cvs aclocal.m4 configure.in.in configure Makefile.am acinclude.m4 Makefile.am.in
#>+ 2
docs-am:
-#>+ 6
-+#>+ 15
++#>+ 7
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu doc/Makefile
-+ @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) --foreign doc/Makefile'; \
-+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign doc/Makefile
- cd $(top_srcdir) && perl admin/am_edit doc/Makefile.in
+- $(AUTOMAKE) --foreign Makefile
++ \
++ cd $(srcdir) && $(AUTOMAKE) --foreign \
++
+ cd $(top_srcdir) && perl admin/am_edit Makefile.in
-diff -Nru gwenview-1.2.0.orig/gvdirpart/Makefile.in gwenview-1.2.0/gvdirpart/Makefile.in
---- gwenview-1.2.0.orig/gvdirpart/Makefile.in 2005-04-03 13:19:02.000000000 +0000
-+++ gwenview-1.2.0/gvdirpart/Makefile.in 2005-07-26 19:28:12.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/src/app/Makefile.in gwenview-1.3.0/src/app/Makefile.in
+--- gwenview-1.3.0.orig/src/app/Makefile.in 2005-09-11 10:40:29.000000000 -0400
++++ gwenview-1.3.0/src/app/Makefile.in 2005-09-12 08:43:46.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -31262,29 +19395,29 @@
# 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,6 +15,9 @@
+@@ -15,6 +15,8 @@
@SET_MAKE@
+
-+SOURCES = $(libgvdirpart_la_SOURCES)
+
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -22,7 +25,6 @@
+@@ -22,7 +24,6 @@
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
-@@ -39,6 +41,64 @@
+@@ -39,6 +40,78 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = gvdirpart
++bin_PROGRAMS =
++subdir = src/app
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -31300,17 +19433,27 @@
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(gvdir)" \
-+ "$(DESTDIR)$(kde_servicesdir)"
-+kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(kde_module_LTLIBRARIES)
-+am__DEPENDENCIES_1 =
-+libgvdirpart_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-+ ../src/libgwenviewcore.la
-+am_libgvdirpart_la_OBJECTS = gvdirpart.lo
-+#>- libgvdirpart_la_OBJECTS = $(am_libgvdirpart_la_OBJECTS)
++am__installdirs = "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" \
++ "$(DESTDIR)$(bindir)" "$(DESTDIR)$(rcdir)"
++kdeinitLTLIBRARIES_INSTALL = $(INSTALL)
++libLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(kdeinit_LTLIBRARIES) $(lib_LTLIBRARIES)
++#>- gwenview_la_DEPENDENCIES = ../gvcore/libgwenviewcore.la
+#>+ 1
-+libgvdirpart_la_OBJECTS = gvdirpart.lo
++gwenview_la_DEPENDENCIES = libkdeinit_gwenview.la
++#>- am_gwenview_la_OBJECTS = bookmarkowner.lo bookmarkviewcontroller.lo \
++#>- mainwindow.lo metaedit.lo dirview.lo configdialog.lo \
++#>- branchpropertiesdialog.lo history.lo main.lo
++#>+ 1
++am_gwenview_la_OBJECTS = gwenview_dummy.lo
++#>- gwenview_la_OBJECTS = $(am_gwenview_la_OBJECTS)
++#>+ 1
++gwenview_la_OBJECTS = gwenview_dummy.lo
++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
++#>- PROGRAMS = $(bin_PROGRAMS)
++#>+ 2
++bin_PROGRAMS += gwenview$(EXEEXT)
++PROGRAMS = $(bin_PROGRAMS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+am__depfiles_maybe = depfiles
@@ -31332,11 +19475,14 @@
+#>+ 2
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libgvdirpart_la_SOURCES)
-+DIST_SOURCES = $(libgvdirpart_la_SOURCES)
-+gvDATA_INSTALL = $(INSTALL_DATA)
-+kde_servicesDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(gv_DATA) $(kde_services_DATA)
++#>- SOURCES = $(gwenview_la_SOURCES)
++#>+ 1
++SOURCES = $(gwenview_la_SOURCES) $(gwenview_SOURCES)
++#>- DIST_SOURCES = $(gwenview_la_SOURCES)
++#>+ 1
++DIST_SOURCES = $(gwenview_la_SOURCES) $(gwenview_SOURCES)
++rcDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(rc_DATA)
+ETAGS = etags
+CTAGS = ctags
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -31345,15 +19491,7 @@
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +171,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +210,9 @@
+@@ -164,6 +237,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -31363,7 +19501,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +269,8 @@
+@@ -222,6 +298,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -31372,96 +19510,98 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +278,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +316,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +351,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -303,7 +344,6 @@
- # These are not really libraries, but modules dynamically opened.
- # So they should be installed in kde_module_dir, which is usually $kde_prefix/lib/kde3
- kde_module_LTLIBRARIES = libgvdirpart.la
+@@ -297,16 +376,13 @@
+ xdg_appsdir = @xdg_appsdir@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+-bin_PROGRAMS =
+ #>- lib_LTLIBRARIES =
+ #>+ 1
+ lib_LTLIBRARIES = libkdeinit_gwenview.la
-
- libgvdirpart_la_SOURCES = gvdirpart.cpp
- libgvdirpart_la_LIBADD = $(LIB_KPARTS) ../src/libgwenviewcore.la
- libgvdirpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-@@ -317,91 +357,79 @@
+ kdeinit_LTLIBRARIES = gwenview.la
- # Install the .desktop file into the kde_services directory
- kde_services_DATA = gvdirpart.desktop
+ # -D_LARGEFILE64_SOURCE is necessary on Debian Woody
+ AM_CPPFLAGS = -D_LARGEFILE64_SOURCE
-
- KDE_ICON = AUTO
--subdir = gvdirpart
+ #>- gwenview_la_SOURCES = \
+ #>- bookmarkowner.cpp \
+ #>- bookmarkviewcontroller.cpp \
+@@ -342,7 +418,6 @@
+ history.cpp \
+ main.cpp configfileoperationspage.cpp configfullscreenpage.cpp configimagelistpage.cpp configimageviewpage.cpp configmiscpage.cpp branchpropertiesdialogbase.cpp
+
+-
+ #>- gwenview_la_LIBADD = ../gvcore/libgwenviewcore.la
+ #>+ 1
+ gwenview_la_LIBADD = libkdeinit_gwenview.la
+@@ -352,157 +427,108 @@
+
+ # set the include path for X, qt and KDE
+ INCLUDES = -I$(srcdir)/.. $(all_includes)
+-
+ #>- METASOURCES = AUTO
+-
+ rcdir = $(kde_datadir)/gwenview
+ rc_DATA = gwenviewui.rc
+-subdir = src/app
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
--LTLIBRARIES = $(kde_module_LTLIBRARIES)
+-LTLIBRARIES = $(kdeinit_LTLIBRARIES) $(lib_LTLIBRARIES)
-
--libgvdirpart_la_DEPENDENCIES = ../src/libgwenviewcore.la
--am_libgvdirpart_la_OBJECTS = gvdirpart.lo
--#>- libgvdirpart_la_OBJECTS = $(am_libgvdirpart_la_OBJECTS)
+-#>- gwenview_la_DEPENDENCIES = ../gvcore/libgwenviewcore.la
-#>+ 1
--libgvdirpart_la_OBJECTS = gvdirpart.lo
+-gwenview_la_DEPENDENCIES = libkdeinit_gwenview.la
+-#>- am_gwenview_la_OBJECTS = bookmarkowner.lo bookmarkviewcontroller.lo \
+-#>- mainwindow.lo metaedit.lo dirview.lo configdialog.lo \
+-#>- branchpropertiesdialog.lo history.lo main.lo
+-#>+ 1
+-am_gwenview_la_OBJECTS = gwenview_dummy.lo
+-#>- gwenview_la_OBJECTS = $(am_gwenview_la_OBJECTS)
+-#>+ 1
+-gwenview_la_OBJECTS = gwenview_dummy.lo
+-bin_PROGRAMS =
+-#>- PROGRAMS = $(bin_PROGRAMS)
+-#>+ 2
+-bin_PROGRAMS += gwenview$(EXEEXT)
+-PROGRAMS = $(bin_PROGRAMS)
-
+-
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-am__depfiles_maybe = depfiles
--#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/gvdirpart.Plo
--#>+ 1
-- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gvdirpart.Plo
+-#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/bookmarkowner.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/bookmarkviewcontroller.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/branchpropertiesdialog.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/configdialog.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/dirview.Plo ./$(DEPDIR)/history.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo ./$(DEPDIR)/mainwindow.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/metaedit.Plo
+-#>+ 14
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/gwenview.la.Po $(DEPDIR)/gwenview_dummy.Plo $(DEPDIR)/configfileoperationspage.P $(DEPDIR)/configfullscreenpage.P $(DEPDIR)/configimagelistpage.P $(DEPDIR)/configimageviewpage.P $(DEPDIR)/configmiscpage.P $(DEPDIR)/branchpropertiesdialogbase.P $(DEPDIR)/libkdeinit_gwenview_la.all_cpp.P ./$(DEPDIR)/bookmarkowner.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/bookmarkviewcontroller.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/branchpropertiesdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/configdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dirview.Plo ./$(DEPDIR)/history.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo ./$(DEPDIR)/mainwindow.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/metaedit.Plo
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/gwenview.la.Po $(DEPDIR)/gwenview_dummy.Plo $(DEPDIR)/configfileoperationspage.P $(DEPDIR)/configfullscreenpage.P $(DEPDIR)/configimagelistpage.P $(DEPDIR)/configimageviewpage.P $(DEPDIR)/configmiscpage.P $(DEPDIR)/branchpropertiesdialogbase.P ./$(DEPDIR)/bookmarkowner.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/bookmarkviewcontroller.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/branchpropertiesdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/configdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dirview.Plo ./$(DEPDIR)/history.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo ./$(DEPDIR)/mainwindow.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/metaedit.Plo
-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 2
@@ -31480,11 +19620,15 @@
-#>+ 2
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(libgvdirpart_la_SOURCES)
--DATA = $(gv_DATA) $(kde_services_DATA)
+-#>- DIST_SOURCES = $(gwenview_la_SOURCES)
+-#>+ 1
+-DIST_SOURCES = $(gwenview_la_SOURCES) $(gwenview_SOURCES)
+-DATA = $(rc_DATA)
-
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--SOURCES = $(libgvdirpart_la_SOURCES)
+-#>- SOURCES = $(gwenview_la_SOURCES)
+-#>+ 1
+-SOURCES = $(gwenview_la_SOURCES) $(gwenview_SOURCES)
-
#>- all: all-am
#>+ 1
@@ -31502,11 +19646,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign gvdirpart/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/app/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu gvdirpart/Makefile
+-#>- $(AUTOMAKE) --gnu src/app/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign gvdirpart/Makefile
++#>- $(AUTOMAKE) --foreign src/app/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -31516,14 +19660,14 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign gvdirpart/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/app/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu gvdirpart/Makefile
-+ $(AUTOMAKE) --foreign gvdirpart/Makefile
- cd $(top_srcdir) && perl admin/am_edit gvdirpart/Makefile.in
+- $(AUTOMAKE) --gnu src/app/Makefile
++ $(AUTOMAKE) --foreign src/app/Makefile
+ cd $(top_srcdir) && perl admin/am_edit src/app/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
--kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+-kdeinitLTLIBRARIES_INSTALL = $(INSTALL)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
@@ -31541,53 +19685,123 @@
+ 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-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
-+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- $(mkinstalldirs) $(DESTDIR)$(kdeinitdir)
++ test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
+ @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
-- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
+- echo " $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kdeinitdir)/$$f"; \
+- $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kdeinitdir)/$$f; \
+ f=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
-+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
++ echo " $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kdeinitdir)/$$f'"; \
++ $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kdeinitdir)/$$f"; \
else :; fi; \
done
- uninstall-kde_moduleLTLIBRARIES:
+ uninstall-kdeinitLTLIBRARIES:
@$(NORMAL_UNINSTALL)
-- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
- p="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
-- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
-+ @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kdeinitdir)/$$p"; \
+- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kdeinitdir)/$$p; \
++ @set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
-+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
++ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
done
- clean-kde_moduleLTLIBRARIES:
- -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ clean-kdeinitLTLIBRARIES:
+ -test -z "$(kdeinit_LTLIBRARIES)" || rm -f $(kdeinit_LTLIBRARIES)
+ @list='$(kdeinit_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
-@@ -412,7 +440,7 @@
- $(CXXLINK) -rpath $(kde_moduledir) $(libgvdirpart_la_LDFLAGS) $(libgvdirpart_la_OBJECTS) $(libgvdirpart_la_LIBADD) $(LIBS)
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- $(mkinstalldirs) $(DESTDIR)$(libdir)
++ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f="`echo $$p | sed -e 's|^.*/||'`"; \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
++ f=$(am__strip_dir) \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
++ $(LIBTOOL) --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; \
++ @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p=$(am__strip_dir) \
++ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
++ $(LIBTOOL) --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
+@@ -511,18 +537,17 @@
+ @KDE_USE_CLOSURE_TRUE at gwenview.la: gwenview.la.closure $(gwenview_la_OBJECTS) $(gwenview_la_DEPENDENCIES)
+ @KDE_USE_CLOSURE_FALSE at gwenview.la: $(gwenview_la_OBJECTS) $(gwenview_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(kdeinitdir) $(gwenview_la_LDFLAGS) $(gwenview_la_OBJECTS) $(gwenview_la_LIBADD) $(LIBS)
+-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- $(mkinstalldirs) $(DESTDIR)$(bindir)
++ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+ || test -f $$p1 \
+ ; then \
+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
+- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+ else :; fi; \
+ done
+
+@@ -530,8 +555,8 @@
+ @$(NORMAL_UNINSTALL)
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+- echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
+- rm -f $(DESTDIR)$(bindir)/$$f; \
++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
++ rm -f "$(DESTDIR)$(bindir)/$$f"; \
+ done
+
+ clean-binPROGRAMS:
+@@ -542,7 +567,7 @@
+ done
+
mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
+ -rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
-@@ -420,37 +448,25 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gvdirpart.Plo at am__quote@
+@@ -558,37 +583,25 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/metaedit.Plo at am__quote@
.cpp.o:
- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@@ -31636,61 +19850,36 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -461,51 +477,41 @@
+@@ -599,33 +612,24 @@
distclean-libtool:
-rm -f libtool
uninstall-info-am:
--gvDATA_INSTALL = $(INSTALL_DATA)
- install-gvDATA: $(gv_DATA)
+-rcDATA_INSTALL = $(INSTALL_DATA)
+ install-rcDATA: $(rc_DATA)
@$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(gvdir)
-+ test -z "$(gvdir)" || $(mkdir_p) "$(DESTDIR)$(gvdir)"
- @list='$(gv_DATA)'; for p in $$list; do \
+- $(mkinstalldirs) $(DESTDIR)$(rcdir)
++ test -z "$(rcdir)" || $(mkdir_p) "$(DESTDIR)$(rcdir)"
+ @list='$(rc_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(gvDATA_INSTALL) $$d$$p $(DESTDIR)$(gvdir)/$$f"; \
-- $(gvDATA_INSTALL) $$d$$p $(DESTDIR)$(gvdir)/$$f; \
+- echo " $(rcDATA_INSTALL) $$d$$p $(DESTDIR)$(rcdir)/$$f"; \
+- $(rcDATA_INSTALL) $$d$$p $(DESTDIR)$(rcdir)/$$f; \
+ f=$(am__strip_dir) \
-+ echo " $(gvDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gvdir)/$$f'"; \
-+ $(gvDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gvdir)/$$f"; \
++ echo " $(rcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(rcdir)/$$f'"; \
++ $(rcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(rcdir)/$$f"; \
done
- uninstall-gvDATA:
+ uninstall-rcDATA:
@$(NORMAL_UNINSTALL)
- @list='$(gv_DATA)'; for p in $$list; do \
+ @list='$(rc_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(gvdir)/$$f"; \
-- rm -f $(DESTDIR)$(gvdir)/$$f; \
+- echo " rm -f $(DESTDIR)$(rcdir)/$$f"; \
+- rm -f $(DESTDIR)$(rcdir)/$$f; \
+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(gvdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(gvdir)/$$f"; \
++ echo " rm -f '$(DESTDIR)$(rcdir)/$$f'"; \
++ rm -f "$(DESTDIR)$(rcdir)/$$f"; \
done
--kde_servicesDATA_INSTALL = $(INSTALL_DATA)
- install-kde_servicesDATA: $(kde_services_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
-+ test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
- @list='$(kde_services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
- uninstall-kde_servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_services_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-
-ETAGS = etags
-ETAGSFLAGS =
-
@@ -31702,7 +19891,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -514,6 +520,7 @@
+@@ -634,6 +638,7 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -31710,7 +19899,7 @@
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -525,10 +532,11 @@
+@@ -645,10 +650,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -31726,7 +19915,7 @@
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -551,12 +559,6 @@
+@@ -671,12 +677,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -31734,12 +19923,12 @@
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ..
+-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -570,7 +572,7 @@
+@@ -690,7 +690,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -31748,20 +19937,428 @@
else \
dir=''; \
fi; \
-@@ -588,9 +590,10 @@
+@@ -710,9 +710,10 @@
+ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
+ install-binPROGRAMS: install-libLTLIBRARIES
+
+-
+ installdirs:
+- $(mkinstalldirs) $(DESTDIR)$(kdeinitdir) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(rcdir)
++ for dir in "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(rcdir)"; do \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
++ done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -732,7 +733,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"
+@@ -757,6 +758,8 @@
+
+ dvi-am:
+
++html: html-am
++
+ info: info-am
+
+ info-am:
+@@ -797,16 +800,17 @@
+ clean-generic clean-kdeinitLTLIBRARIES clean-libLTLIBRARIES \
+ clean-libtool ctags distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
+- dvi-am info info-am install install-am install-binPROGRAMS \
+- install-data install-data-am install-exec install-exec-am \
+- install-info install-info-am install-kdeinitLTLIBRARIES \
+- install-libLTLIBRARIES install-man install-rcDATA install-strip \
+- installcheck installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-binPROGRAMS \
+- uninstall-info-am uninstall-kdeinitLTLIBRARIES \
+- uninstall-libLTLIBRARIES uninstall-rcDATA
++ dvi-am html html-am info info-am install install-am \
++ install-binPROGRAMS install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am \
++ install-kdeinitLTLIBRARIES install-libLTLIBRARIES install-man \
++ install-rcDATA install-strip installcheck installcheck-am \
++ installdirs maintainer-clean maintainer-clean-generic \
++ mostlyclean mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
++ uninstall-am uninstall-binPROGRAMS uninstall-info-am \
++ uninstall-kdeinitLTLIBRARIES uninstall-libLTLIBRARIES \
++ uninstall-rcDATA
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+@@ -840,13 +844,6 @@
+ gwenview_DEPENDENCIES = libkdeinit_gwenview.la
+
+ #>+ 3
+-mainwindow.moc: $(srcdir)/mainwindow.h
+- $(MOC) $(srcdir)/mainwindow.h -o mainwindow.moc
+-
+-#>+ 2
+-mocs: mainwindow.moc
+-
+-#>+ 3
+ history.moc: $(srcdir)/history.h
+ $(MOC) $(srcdir)/history.h -o history.moc
+
+@@ -861,18 +858,18 @@
+ mocs: configdialog.moc
+
+ #>+ 3
+-bookmarkowner.moc: $(srcdir)/bookmarkowner.h
+- $(MOC) $(srcdir)/bookmarkowner.h -o bookmarkowner.moc
++metaedit.moc: $(srcdir)/metaedit.h
++ $(MOC) $(srcdir)/metaedit.h -o metaedit.moc
+
+ #>+ 2
+-mocs: bookmarkowner.moc
++mocs: metaedit.moc
+
+ #>+ 3
+-metaedit.moc: $(srcdir)/metaedit.h
+- $(MOC) $(srcdir)/metaedit.h -o metaedit.moc
++bookmarkowner.moc: $(srcdir)/bookmarkowner.h
++ $(MOC) $(srcdir)/bookmarkowner.h -o bookmarkowner.moc
+
+ #>+ 2
+-mocs: metaedit.moc
++mocs: bookmarkowner.moc
+
+ #>+ 3
+ dirview.moc: $(srcdir)/dirview.h
+@@ -882,18 +879,25 @@
+ mocs: dirview.moc
+
+ #>+ 3
+-branchpropertiesdialog.moc: $(srcdir)/branchpropertiesdialog.h
+- $(MOC) $(srcdir)/branchpropertiesdialog.h -o branchpropertiesdialog.moc
++bookmarkviewcontroller.moc: $(srcdir)/bookmarkviewcontroller.h
++ $(MOC) $(srcdir)/bookmarkviewcontroller.h -o bookmarkviewcontroller.moc
+
+ #>+ 2
+-mocs: branchpropertiesdialog.moc
++mocs: bookmarkviewcontroller.moc
+
+ #>+ 3
+-bookmarkviewcontroller.moc: $(srcdir)/bookmarkviewcontroller.h
+- $(MOC) $(srcdir)/bookmarkviewcontroller.h -o bookmarkviewcontroller.moc
++mainwindow.moc: $(srcdir)/mainwindow.h
++ $(MOC) $(srcdir)/mainwindow.h -o mainwindow.moc
+
+ #>+ 2
+-mocs: bookmarkviewcontroller.moc
++mocs: mainwindow.moc
++
++#>+ 3
++branchpropertiesdialog.moc: $(srcdir)/branchpropertiesdialog.h
++ $(MOC) $(srcdir)/branchpropertiesdialog.h -o branchpropertiesdialog.moc
++
++#>+ 2
++mocs: branchpropertiesdialog.moc
+
+ #>+ 8
+ gwenview.la.closure: $(gwenview_la_OBJECTS) $(gwenview_la_DEPENDENCIES)
+@@ -906,10 +910,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f mainwindow.moc history.moc configdialog.moc bookmarkowner.moc metaedit.moc dirview.moc branchpropertiesdialog.moc bookmarkviewcontroller.moc
++ -rm -f history.moc configdialog.moc metaedit.moc bookmarkowner.moc dirview.moc bookmarkviewcontroller.moc mainwindow.moc branchpropertiesdialog.moc
+
+ #>+ 2
+-KDE_DIST=gwenviewui.rc dirview.h truncatedtextlabel.h branchpropertiesdialogbase.ui Makefile.in mainwindow.h bookmarkowner.h history.h configimageviewpage.ui metaedit.h configfullscreenpage.ui configfileoperationspage.ui branchpropertiesdialog.h bookmarkviewcontroller.h configdialog.h configmiscpage.ui configimagelistpage.ui
++KDE_DIST=gwenviewui.rc truncatedtextlabel.h dirview.h branchpropertiesdialogbase.ui Makefile.in mainwindow.h history.h bookmarkowner.h configimageviewpage.ui metaedit.h configfullscreenpage.ui configfileoperationspage.ui branchpropertiesdialog.h Makefile.am bookmarkviewcontroller.h configdialog.h configmiscpage.ui configimagelistpage.ui
+
+ #>+ 9
+ clean-ui:
+@@ -928,10 +932,19 @@
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu src/app/Makefile
++ @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) --foreign src/app/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign src/app/Makefile
+ cd $(top_srcdir) && perl admin/am_edit src/app/Makefile.in
+
+
+@@ -958,7 +971,7 @@
+
+
+ #>+ 11
+-libkdeinit_gwenview_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/bookmarkowner.cpp $(srcdir)/bookmarkviewcontroller.cpp $(srcdir)/mainwindow.cpp $(srcdir)/metaedit.cpp $(srcdir)/dirview.cpp $(srcdir)/configdialog.cpp $(srcdir)/branchpropertiesdialog.cpp $(srcdir)/history.cpp $(srcdir)/main.cpp configfileoperationspage.cpp configfullscreenpage.cpp configimagelistpage.cpp configimageviewpage.cpp configmiscpage.cpp branchpropertiesdialogbase.cpp configimagelistpage.moc history.moc configdialog.moc metaedit.moc bookmarkowner.moc dirview.moc bookmarkviewcontroller.moc configfullscreenpage.moc branchpropertiesdialogbase.moc configmiscpage.moc configimageviewpage.moc configfileoperationspage.moc mainwindow.moc branchpropertiesdialog.moc
++libkdeinit_gwenview_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/bookmarkowner.cpp $(srcdir)/bookmarkviewcontroller.cpp $(srcdir)/mainwindow.cpp $(srcdir)/metaedit.cpp $(srcdir)/dirview.cpp $(srcdir)/configdialog.cpp $(srcdir)/branchpropertiesdialog.cpp $(srcdir)/history.cpp $(srcdir)/main.cpp configfileoperationspage.cpp configfullscreenpage.cpp configimagelistpage.cpp configimageviewpage.cpp configmiscpage.cpp branchpropertiesdialogbase.cpp configimagelistpage.moc history.moc configdialog.moc bookmarkowner.moc metaedit.moc dirview.moc bookmarkviewcontroller.moc configfullscreenpage.moc branchpropertiesdialogbase.moc configmiscpage.moc configimageviewpage.moc configfileoperationspage.moc mainwindow.moc branchpropertiesdialog.moc
+ @echo 'creating libkdeinit_gwenview_la.all_cpp.cpp ...'; \
+ rm -f libkdeinit_gwenview_la.all_cpp.files libkdeinit_gwenview_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkdeinit_gwenview_la.all_cpp.final; \
+diff -Nru gwenview-1.3.0.orig/src/desktopfiles/Makefile.in gwenview-1.3.0/src/desktopfiles/Makefile.in
+--- gwenview-1.3.0.orig/src/desktopfiles/Makefile.in 2005-09-11 10:40:29.000000000 -0400
++++ gwenview-1.3.0/src/desktopfiles/Makefile.in 2005-09-12 08:43:46.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 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.
+@@ -22,7 +22,6 @@
+ 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
+@@ -39,6 +38,32 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = src/desktopfiles
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_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)$(konqservicedir)" \
++ "$(DESTDIR)$(xdg_appsdir)"
++konqserviceDATA_INSTALL = $(INSTALL_DATA)
++xdg_appsDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(konqservice_DATA) $(xdg_apps_DATA)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +189,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +250,8 @@
+ 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@
+@@ -273,6 +303,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -304,31 +335,54 @@
+ # file for konqueror integration
+ konqservicedir = $(kde_datadir)/konqueror/servicemenus
+ konqservice_DATA = konqgwenview.desktop
+-
+ EXTRA_DIST = $(xdg_apps_DATA) $(konqservice_DATA)
+-subdir = src/desktopfiles
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-DATA = $(konqservice_DATA) $(xdg_apps_DATA)
+-
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ #>- all: all-am
+ #>+ 1
+ all: docs-am all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/desktopfiles/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu src/desktopfiles/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign src/desktopfiles/Makefile
++#>+ 12
++ @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) --foreign src/desktopfiles/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu src/desktopfiles/Makefile
++ $(AUTOMAKE) --foreign src/desktopfiles/Makefile
+ cd $(top_srcdir) && perl admin/am_edit src/desktopfiles/Makefile.in
+-Makefile: $(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
+@@ -339,41 +393,39 @@
+ distclean-libtool:
+ -rm -f libtool
+ uninstall-info-am:
+-konqserviceDATA_INSTALL = $(INSTALL_DATA)
+ install-konqserviceDATA: $(konqservice_DATA)
+ @$(NORMAL_INSTALL)
+- $(mkinstalldirs) $(DESTDIR)$(konqservicedir)
++ test -z "$(konqservicedir)" || $(mkdir_p) "$(DESTDIR)$(konqservicedir)"
+ @list='$(konqservice_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f="`echo $$p | sed -e 's|^.*/||'`"; \
+- echo " $(konqserviceDATA_INSTALL) $$d$$p $(DESTDIR)$(konqservicedir)/$$f"; \
+- $(konqserviceDATA_INSTALL) $$d$$p $(DESTDIR)$(konqservicedir)/$$f; \
++ f=$(am__strip_dir) \
++ echo " $(konqserviceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(konqservicedir)/$$f'"; \
++ $(konqserviceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(konqservicedir)/$$f"; \
+ done
+
+ uninstall-konqserviceDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(konqservice_DATA)'; for p in $$list; do \
+- f="`echo $$p | sed -e 's|^.*/||'`"; \
+- echo " rm -f $(DESTDIR)$(konqservicedir)/$$f"; \
+- rm -f $(DESTDIR)$(konqservicedir)/$$f; \
++ f=$(am__strip_dir) \
++ echo " rm -f '$(DESTDIR)$(konqservicedir)/$$f'"; \
++ rm -f "$(DESTDIR)$(konqservicedir)/$$f"; \
+ done
+-xdg_appsDATA_INSTALL = $(INSTALL_DATA)
+ install-xdg_appsDATA: $(xdg_apps_DATA)
+ @$(NORMAL_INSTALL)
+- $(mkinstalldirs) $(DESTDIR)$(xdg_appsdir)
++ test -z "$(xdg_appsdir)" || $(mkdir_p) "$(DESTDIR)$(xdg_appsdir)"
+ @list='$(xdg_apps_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f="`echo $$p | sed -e 's|^.*/||'`"; \
+- echo " $(xdg_appsDATA_INSTALL) $$d$$p $(DESTDIR)$(xdg_appsdir)/$$f"; \
+- $(xdg_appsDATA_INSTALL) $$d$$p $(DESTDIR)$(xdg_appsdir)/$$f; \
++ f=$(am__strip_dir) \
++ echo " $(xdg_appsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xdg_appsdir)/$$f'"; \
++ $(xdg_appsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xdg_appsdir)/$$f"; \
+ done
+
+ uninstall-xdg_appsDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(xdg_apps_DATA)'; for p in $$list; do \
+- f="`echo $$p | sed -e 's|^.*/||'`"; \
+- echo " rm -f $(DESTDIR)$(xdg_appsdir)/$$f"; \
+- rm -f $(DESTDIR)$(xdg_appsdir)/$$f; \
++ f=$(am__strip_dir) \
++ echo " rm -f '$(DESTDIR)$(xdg_appsdir)/$$f'"; \
++ rm -f "$(DESTDIR)$(xdg_appsdir)/$$f"; \
+ done
+ tags: TAGS
+ TAGS:
+@@ -381,12 +433,6 @@
+ ctags: CTAGS
+ CTAGS:
+
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -400,7 +446,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -418,9 +464,10 @@
check-am: all-am
check: check-am
- all-am: Makefile $(LTLIBRARIES) $(DATA)
+ all-am: Makefile $(DATA)
-
installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(gvdir) $(DESTDIR)$(kde_servicesdir)
-+ for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(gvdir)" "$(DESTDIR)$(kde_servicesdir)"; do \
+- $(mkinstalldirs) $(DESTDIR)$(konqservicedir) $(DESTDIR)$(xdg_appsdir)
++ for dir in "$(DESTDIR)$(konqservicedir)" "$(DESTDIR)$(xdg_appsdir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
-@@ -610,7 +613,7 @@
+@@ -440,7 +487,7 @@
clean-generic:
distclean-generic:
@@ -31770,7 +20367,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -635,6 +638,8 @@
+@@ -461,6 +508,8 @@
dvi-am:
@@ -31779,47 +20376,337 @@
info: info-am
info-am:
-@@ -682,8 +687,8 @@
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
-- distclean-tags distdir dvi dvi-am info info-am install \
-- install-am install-data install-data-am install-exec \
-+ distclean-tags distdir dvi dvi-am html html-am info info-am \
-+ install install-am install-data install-data-am install-exec \
- install-exec-am install-gvDATA install-info install-info-am \
- install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
- install-man install-strip installcheck installcheck-am \
-@@ -718,7 +723,7 @@
- -rm -f gvdirpart.moc
+@@ -496,29 +545,39 @@
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+- dvi-am info info-am install install-am install-data \
+- install-data-am install-exec install-exec-am install-info \
+- install-info-am install-konqserviceDATA install-man \
+- install-strip install-xdg_appsDATA installcheck installcheck-am \
+- installdirs maintainer-clean maintainer-clean-generic \
+- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+- ps ps-am uninstall uninstall-am uninstall-info-am \
+- uninstall-konqserviceDATA uninstall-xdg_appsDATA
++ dvi-am html html-am info info-am install install-am \
++ install-data install-data-am install-exec install-exec-am \
++ install-info install-info-am install-konqserviceDATA \
++ install-man install-strip install-xdg_appsDATA installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-generic \
++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
++ uninstall-info-am uninstall-konqserviceDATA \
++ uninstall-xdg_appsDATA
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
--KDE_DIST=gvdirpart.desktop Makefile.in cr22-app-imagegallery.png cr16-app-imagegallery.png gvdirpart.rc gvdirpart.h
-+KDE_DIST=gvdirpart.desktop Makefile.in cr16-app-imagegallery.png cr22-app-imagegallery.png gvdirpart.rc gvdirpart.h Makefile.am
+-KDE_DIST=Makefile.in gwenview.desktop konqgwenview.desktop
++KDE_DIST=Makefile.in gwenview.desktop konqgwenview.desktop Makefile.am
- #>+ 3
- clean-closures:
-@@ -729,19 +734,28 @@
+ #>+ 2
+ docs-am:
- #>+ 10
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-imagegallery.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/imagegallery.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
- $(INSTALL_DATA) $(srcdir)/cr22-app-imagegallery.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/imagegallery.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-imagegallery.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/imagegallery.png
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu src/desktopfiles/Makefile
++ @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) --foreign src/desktopfiles/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign src/desktopfiles/Makefile
+ cd $(top_srcdir) && perl admin/am_edit src/desktopfiles/Makefile.in
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/imagegallery.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/imagegallery.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/imagegallery.png
+diff -Nru gwenview-1.3.0.orig/src/doc/Makefile.in gwenview-1.3.0/src/doc/Makefile.in
+--- gwenview-1.3.0.orig/src/doc/Makefile.in 2005-09-11 10:40:29.000000000 -0400
++++ gwenview-1.3.0/src/doc/Makefile.in 2005-09-12 08:43:46.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,25 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = src/doc
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++man1dir = $(mandir)/man1
++am__installdirs = "$(DESTDIR)$(man1dir)"
++NROFF = nroff
++MANS = $(man_MANS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +181,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +242,8 @@
+ 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@
+@@ -273,6 +295,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -298,30 +321,53 @@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ man_MANS = gwenview.1
+-subdir = src/doc
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-NROFF = nroff
+-MANS = $(man_MANS)
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ #>- all: all-am
+ #>+ 1
+ all: docs-am all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/doc/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu src/doc/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign src/doc/Makefile
++#>+ 12
++ @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) --foreign src/doc/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu src/doc/Makefile
++ $(AUTOMAKE) --foreign src/doc/Makefile
+ cd $(top_srcdir) && perl admin/am_edit src/doc/Makefile.in
+-Makefile: $(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
+@@ -332,11 +378,9 @@
+ 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 \
+@@ -355,8 +399,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)
+@@ -376,8 +420,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:
+@@ -385,12 +429,6 @@
+ ctags: CTAGS
+ CTAGS:
+
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -404,7 +442,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -422,9 +460,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(MANS)
+-
+ 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
+@@ -444,7 +483,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"
+@@ -465,6 +504,8 @@
+
+ dvi-am:
+
++html: html-am
++
+ info: info-am
+
+ info-am:
+@@ -501,28 +542,38 @@
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+- dvi-am info info-am install install-am install-data \
+- install-data-am 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 mostlyclean mostlyclean-generic \
+- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+- uninstall-info-am uninstall-man uninstall-man1
++ dvi-am html html-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-man1 \
++ install-strip installcheck installcheck-am installdirs \
++ maintainer-clean maintainer-clean-generic mostlyclean \
++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++ uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man1
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=Makefile.in gwenview.1
++KDE_DIST=Makefile.in gwenview.1 Makefile.am
+
+ #>+ 2
+ docs-am:
+
-#>+ 6
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu gvdirpart/Makefile
+- $(AUTOMAKE) --gnu src/doc/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -31828,19 +20715,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign gvdirpart/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/doc/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign gvdirpart/Makefile
- cd $(top_srcdir) && perl admin/am_edit gvdirpart/Makefile.in
++ $(AUTOMAKE) --foreign src/doc/Makefile
+ cd $(top_srcdir) && perl admin/am_edit src/doc/Makefile.in
-diff -Nru gwenview-1.2.0.orig/gvimagepart/Makefile.in gwenview-1.2.0/gvimagepart/Makefile.in
---- gwenview-1.2.0.orig/gvimagepart/Makefile.in 2005-04-03 13:19:02.000000000 +0000
-+++ gwenview-1.2.0/gvimagepart/Makefile.in 2005-07-26 19:28:12.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/src/gvcore/Makefile.in gwenview-1.3.0/src/gvcore/Makefile.in
+--- gwenview-1.3.0.orig/src/gvcore/Makefile.in 2005-09-11 10:40:29.000000000 -0400
++++ gwenview-1.3.0/src/gvcore/Makefile.in 2005-09-12 08:43:46.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -31850,30 +20737,30 @@
# 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,6 +15,9 @@
+@@ -15,6 +15,8 @@
@SET_MAKE@
+
-+SOURCES = $(libgvimagepart_la_SOURCES)
+
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -22,7 +25,6 @@
+@@ -22,7 +24,6 @@
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
-@@ -39,6 +41,64 @@
+@@ -39,6 +40,100 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = gvimagepart
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++subdir = src/gvcore
++DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
++ $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.in
@@ -31888,17 +20775,52 @@
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(gvdir)" \
-+ "$(DESTDIR)$(kde_servicesdir)"
-+kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(kde_module_LTLIBRARIES)
++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kde_kcfgdir)"
++libLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(lib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
-+libgvimagepart_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-+ ../src/libgwenviewcore.la
-+am_libgvimagepart_la_OBJECTS = gvimagepart.lo
-+#>- libgvimagepart_la_OBJECTS = $(am_libgvimagepart_la_OBJECTS)
-+#>+ 1
-+libgvimagepart_la_OBJECTS = gvimagepart.lo
++ at libexif_internal_FALSE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
++ at libexif_internal_TRUE@am__DEPENDENCIES_2 = ../libgvexif/libgvexif.la
++libgwenviewcore_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_2) ../imageutils/libgvimageutils.la \
++ ../tsthread/libtsthread.la
++am_libgwenviewcore_la_OBJECTS = printdialog.lo thumbnailloadjob.lo \
++ imageview.lo batchmanipulator.lo document.lo \
++ externaltoolmanager.lo externaltoolcontext.lo \
++ externaltoolaction.lo externaltooldialog.lo fileviewstack.lo \
++ filethumbnailview.lo fileoperation.lo fileopobject.lo \
++ filethumbnailviewitem.lo qxcfi.lo archive.lo slideshow.lo \
++ filedetailview.lo filedetailviewitem.lo imagesavedialog.lo \
++ slideshowdialog.lo jpegformattype.lo pngformattype.lo \
++ mngformattype.lo xpm.lo documentimpl.lo documentloadingimpl.lo \
++ documentloadedimpl.lo documentjpegloadedimpl.lo \
++ documentanimatedloadedimpl.lo kipiinterface.lo \
++ busylevelmanager.lo cache.lo threadgate.lo imageviewtools.lo \
++ fullscreenbar.lo imageloader.lo cursortracker.lo \
++ captionformatter.lo thumbnaildetailsdialog.lo
++#>- libgwenviewcore_la_OBJECTS = $(am_libgwenviewcore_la_OBJECTS)
++#>+ 17
++libgwenviewcore_la_final_OBJECTS = libgwenviewcore_la.all_cpp.lo
++libgwenviewcore_la_nofinal_OBJECTS = printdialog.lo thumbnailloadjob.lo \
++ imageview.lo batchmanipulator.lo document.lo \
++ externaltoolmanager.lo externaltoolcontext.lo \
++ externaltoolaction.lo externaltooldialog.lo fileviewstack.lo \
++ filethumbnailview.lo fileoperation.lo fileopobject.lo \
++ filethumbnailviewitem.lo qxcfi.lo archive.lo slideshow.lo \
++ filedetailview.lo filedetailviewitem.lo imagesavedialog.lo \
++ slideshowdialog.lo jpegformattype.lo pngformattype.lo \
++ mngformattype.lo xpm.lo documentimpl.lo documentloadingimpl.lo \
++ documentloadedimpl.lo documentjpegloadedimpl.lo \
++ documentanimatedloadedimpl.lo kipiinterface.lo \
++ busylevelmanager.lo cache.lo threadgate.lo imageviewtools.lo \
++ fullscreenbar.lo imageloader.lo cursortracker.lo \
++ captionformatter.lo thumbnaildetailsdialog.lo printdialogpagebase.lo externaltooldialogbase.lo slideshowdialogbase.lo thumbnaildetailsdialogbase.lo gvconfig.lo
++ at KDE_USE_FINAL_FALSE@libgwenviewcore_la_OBJECTS = $(libgwenviewcore_la_nofinal_OBJECTS)
++ at KDE_USE_FINAL_TRUE@libgwenviewcore_la_OBJECTS = $(libgwenviewcore_la_final_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+am__depfiles_maybe = depfiles
@@ -31920,11 +20842,11 @@
+#>+ 2
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libgvimagepart_la_SOURCES)
-+DIST_SOURCES = $(libgvimagepart_la_SOURCES)
-+gvDATA_INSTALL = $(INSTALL_DATA)
-+kde_servicesDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(gv_DATA) $(kde_services_DATA)
++SOURCES = $(libgwenviewcore_la_SOURCES)
++DIST_SOURCES = $(libgwenviewcore_la_SOURCES)
++kde_kcfgDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(kde_kcfg_DATA)
++HEADERS = $(noinst_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -31933,15 +20855,7 @@
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +171,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +210,9 @@
+@@ -164,6 +259,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -31951,7 +20865,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +269,8 @@
+@@ -222,6 +320,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -31960,94 +20874,225 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +278,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +316,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +373,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -303,7 +344,6 @@
- # These are not really libraries, but modules dynamically opened.
- # So they should be installed in kde_module_dir, which is usually $kde_prefix/lib/kde3
- kde_module_LTLIBRARIES = libgvimagepart.la
+@@ -297,33 +398,26 @@
+ xdg_appsdir = @xdg_appsdir@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
++ at libexif_internal_FALSE@GV_LIBEXIF_LIBS = $(LIBEXIF_LIBS)
+
+ # Do *NOT* indent the content of the ifs, this will break the generated
+ # Makefile
+ @libexif_internal_TRUE at GV_LIBEXIF_LIBS = ../libgvexif/libgvexif.la
+- at libexif_internal_FALSE@GV_LIBEXIF_LIBS = $(LIBEXIF_LIBS)
+- at libexif_internal_TRUE@GV_LIBEXIF_CFLAGS = -I$(srcdir)/../libgvexif
+ @libexif_internal_FALSE at GV_LIBEXIF_CFLAGS = $(LIBEXIF_CFLAGS)
-
- libgvimagepart_la_SOURCES = gvimagepart.cpp
- libgvimagepart_la_LIBADD = $(LIB_KPARTS) ../src/libgwenviewcore.la
- libgvimagepart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-@@ -317,89 +357,78 @@
++ at libexif_internal_TRUE@GV_LIBEXIF_CFLAGS = -I$(srcdir)/../libgvexif
+ AM_CPPFLAGS = -I$(srcdir)/.. $(all_includes) -D_LARGEFILE64_SOURCE
+-
+ lib_LTLIBRARIES = libgwenviewcore.la
+-
+ #>- libgwenviewcore_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
+ #>+ 1
+ libgwenviewcore_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined $(KDE_NO_UNDEFINED)
+-
+ libgwenviewcore_la_LIBADD = \
+ $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KDEPRINT) $(LIB_QT) \
+ $(LIBJPEG) $(LIBPNG) $(LIBMNG) $(GV_LIB_KIPI) \
+ $(GV_LIBEXIF_LIBS) ../imageutils/libgvimageutils.la \
+ ../tsthread/libtsthread.la
- # Install the .desktop file into the kde_services directory
- kde_services_DATA = gvimagepart.desktop
--subdir = gvimagepart
+-
+ #>- libgwenviewcore_la_METASOURCES = AUTO
+-
+ noinst_HEADERS = libgwenview_export.h
+-
+ #>- libgwenviewcore_la_SOURCES = \
+ #>- printdialog.cpp \
+ #>- printdialogpagebase.ui \
+@@ -418,243 +512,79 @@
+ \
+ thumbnaildetailsdialog.cpp printdialogpagebase.cpp externaltooldialogbase.cpp slideshowdialogbase.cpp thumbnaildetailsdialogbase.cpp gvconfig.cpp
+
+-
+ kde_kcfg_DATA = gvconfig.kcfg
+-subdir = src/gvcore
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
--LTLIBRARIES = $(kde_module_LTLIBRARIES)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
-
--libgvimagepart_la_DEPENDENCIES = ../src/libgwenviewcore.la
--am_libgvimagepart_la_OBJECTS = gvimagepart.lo
--#>- libgvimagepart_la_OBJECTS = $(am_libgvimagepart_la_OBJECTS)
--#>+ 1
--libgvimagepart_la_OBJECTS = gvimagepart.lo
+- at libexif_internal_TRUE@libgwenviewcore_la_DEPENDENCIES = \
+- at libexif_internal_TRUE@ ../libgvexif/libgvexif.la \
+- at libexif_internal_TRUE@ ../imageutils/libgvimageutils.la \
+- at libexif_internal_TRUE@ ../tsthread/libtsthread.la
+- at libexif_internal_FALSE@libgwenviewcore_la_DEPENDENCIES = \
+- at libexif_internal_FALSE@ ../imageutils/libgvimageutils.la \
+- at libexif_internal_FALSE@ ../tsthread/libtsthread.la
+-am_libgwenviewcore_la_OBJECTS = printdialog.lo thumbnailloadjob.lo \
+- imageview.lo batchmanipulator.lo document.lo \
+- externaltoolmanager.lo externaltoolcontext.lo \
+- externaltoolaction.lo externaltooldialog.lo fileviewstack.lo \
+- filethumbnailview.lo fileoperation.lo fileopobject.lo \
+- filethumbnailviewitem.lo qxcfi.lo archive.lo slideshow.lo \
+- filedetailview.lo filedetailviewitem.lo imagesavedialog.lo \
+- slideshowdialog.lo jpegformattype.lo pngformattype.lo \
+- mngformattype.lo xpm.lo documentimpl.lo documentloadingimpl.lo \
+- documentloadedimpl.lo documentjpegloadedimpl.lo \
+- documentanimatedloadedimpl.lo kipiinterface.lo \
+- busylevelmanager.lo cache.lo threadgate.lo imageviewtools.lo \
+- fullscreenbar.lo imageloader.lo cursortracker.lo \
+- captionformatter.lo thumbnaildetailsdialog.lo
+-#>- libgwenviewcore_la_OBJECTS = $(am_libgwenviewcore_la_OBJECTS)
+-#>+ 17
+-libgwenviewcore_la_final_OBJECTS = libgwenviewcore_la.all_cpp.lo
+-libgwenviewcore_la_nofinal_OBJECTS = printdialog.lo thumbnailloadjob.lo \
+- imageview.lo batchmanipulator.lo document.lo \
+- externaltoolmanager.lo externaltoolcontext.lo \
+- externaltoolaction.lo externaltooldialog.lo fileviewstack.lo \
+- filethumbnailview.lo fileoperation.lo fileopobject.lo \
+- filethumbnailviewitem.lo qxcfi.lo archive.lo slideshow.lo \
+- filedetailview.lo filedetailviewitem.lo imagesavedialog.lo \
+- slideshowdialog.lo jpegformattype.lo pngformattype.lo \
+- mngformattype.lo xpm.lo documentimpl.lo documentloadingimpl.lo \
+- documentloadedimpl.lo documentjpegloadedimpl.lo \
+- documentanimatedloadedimpl.lo kipiinterface.lo \
+- busylevelmanager.lo cache.lo threadgate.lo imageviewtools.lo \
+- fullscreenbar.lo imageloader.lo cursortracker.lo \
+- captionformatter.lo thumbnaildetailsdialog.lo printdialogpagebase.lo externaltooldialogbase.lo slideshowdialogbase.lo thumbnaildetailsdialogbase.lo gvconfig.lo
+- at KDE_USE_FINAL_FALSE@libgwenviewcore_la_OBJECTS = $(libgwenviewcore_la_nofinal_OBJECTS)
+- at KDE_USE_FINAL_TRUE@libgwenviewcore_la_OBJECTS = $(libgwenviewcore_la_final_OBJECTS)
-
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-am__depfiles_maybe = depfiles
--#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/gvimagepart.Plo
--#>+ 1
-- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gvimagepart.Plo
+-#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/archive.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/batchmanipulator.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/busylevelmanager.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/cache.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/captionformatter.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/cursortracker.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/document.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/documentanimatedloadedimpl.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/documentimpl.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/documentjpegloadedimpl.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/documentloadedimpl.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/documentloadingimpl.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/externaltoolaction.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/externaltoolcontext.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/externaltooldialog.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/externaltoolmanager.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/filedetailview.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/filedetailviewitem.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/fileoperation.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/fileopobject.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/filethumbnailview.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/filethumbnailviewitem.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/fileviewstack.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/fullscreenbar.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/imageloader.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/imagesavedialog.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/imageview.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/imageviewtools.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/jpegformattype.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/kipiinterface.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/mngformattype.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/pngformattype.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/printdialog.Plo ./$(DEPDIR)/qxcfi.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/slideshow.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/slideshowdialog.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/threadgate.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/thumbnaildetailsdialog.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/thumbnailloadjob.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/xpm.Plo
+-#>+ 78
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/printdialogpagebase.P $(DEPDIR)/externaltooldialogbase.P $(DEPDIR)/slideshowdialogbase.P $(DEPDIR)/thumbnaildetailsdialogbase.P $(DEPDIR)/gvconfig.P $(DEPDIR)/libgwenviewcore_la.all_cpp.P ./$(DEPDIR)/archive.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/batchmanipulator.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/busylevelmanager.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cache.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/captionformatter.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cursortracker.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/document.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/documentanimatedloadedimpl.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/documentimpl.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/documentjpegloadedimpl.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/documentloadedimpl.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/documentloadingimpl.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/externaltoolaction.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/externaltoolcontext.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/externaltooldialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/externaltoolmanager.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/filedetailview.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/filedetailviewitem.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/fileoperation.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/fileopobject.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/filethumbnailview.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/filethumbnailviewitem.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/fileviewstack.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/fullscreenbar.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/imageloader.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/imagesavedialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/imageview.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/imageviewtools.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/jpegformattype.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kipiinterface.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/mngformattype.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/pngformattype.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/printdialog.Plo ./$(DEPDIR)/qxcfi.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/slideshow.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/slideshowdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/threadgate.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/thumbnaildetailsdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/thumbnailloadjob.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/xpm.Plo
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/printdialogpagebase.P $(DEPDIR)/externaltooldialogbase.P $(DEPDIR)/slideshowdialogbase.P $(DEPDIR)/thumbnaildetailsdialogbase.P $(DEPDIR)/gvconfig.P ./$(DEPDIR)/archive.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/batchmanipulator.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/busylevelmanager.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cache.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/captionformatter.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cursortracker.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/document.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/documentanimatedloadedimpl.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/documentimpl.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/documentjpegloadedimpl.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/documentloadedimpl.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/documentloadingimpl.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/externaltoolaction.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/externaltoolcontext.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/externaltooldialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/externaltoolmanager.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/filedetailview.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/filedetailviewitem.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/fileoperation.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/fileopobject.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/filethumbnailview.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/filethumbnailviewitem.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/fileviewstack.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/fullscreenbar.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/imageloader.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/imagesavedialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/imageview.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/imageviewtools.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/jpegformattype.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kipiinterface.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/mngformattype.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/pngformattype.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/printdialog.Plo ./$(DEPDIR)/qxcfi.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/slideshow.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/slideshowdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/threadgate.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/thumbnaildetailsdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/thumbnailloadjob.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/xpm.Plo
-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 2
@@ -32066,12 +21111,14 @@
-#>+ 2
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(libgvimagepart_la_SOURCES)
--DATA = $(gv_DATA) $(kde_services_DATA)
+-DIST_SOURCES = $(libgwenviewcore_la_SOURCES)
+-DATA = $(kde_kcfg_DATA)
-
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--SOURCES = $(libgvimagepart_la_SOURCES)
+-HEADERS = $(noinst_HEADERS)
-
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in Makefile.am
+-SOURCES = $(libgwenviewcore_la_SOURCES)
+-
#>- all: all-am
#>+ 1
all: docs-am all-am
@@ -32088,11 +21135,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign gvimagepart/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/gvcore/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu gvimagepart/Makefile
+-#>- $(AUTOMAKE) --gnu src/gvcore/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign gvimagepart/Makefile
++#>- $(AUTOMAKE) --foreign src/gvcore/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -32102,14 +21149,14 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign gvimagepart/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/gvcore/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu gvimagepart/Makefile
-+ $(AUTOMAKE) --foreign gvimagepart/Makefile
- cd $(top_srcdir) && perl admin/am_edit gvimagepart/Makefile.in
+- $(AUTOMAKE) --gnu src/gvcore/Makefile
++ $(AUTOMAKE) --foreign src/gvcore/Makefile
+ cd $(top_srcdir) && perl admin/am_edit src/gvcore/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
--kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
@@ -32127,44 +21174,44 @@
+ 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-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
-+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- $(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 $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
-- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
+- 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) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
-+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
++ 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"; \
else :; fi; \
done
- uninstall-kde_moduleLTLIBRARIES:
+ uninstall-libLTLIBRARIES:
@$(NORMAL_UNINSTALL)
-- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- p="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
-- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
-+ @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
+- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
++ @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
-+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
++ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
done
- clean-kde_moduleLTLIBRARIES:
- -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 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
-@@ -410,7 +439,7 @@
- $(CXXLINK) -rpath $(kde_moduledir) $(libgvimagepart_la_LDFLAGS) $(libgvimagepart_la_OBJECTS) $(libgvimagepart_la_LIBADD) $(LIBS)
+@@ -665,7 +595,7 @@
+ $(CXXLINK) -rpath $(libdir) $(libgwenviewcore_la_LDFLAGS) $(libgwenviewcore_la_OBJECTS) $(libgwenviewcore_la_LIBADD) $(LIBS)
mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
@@ -32172,8 +21219,8 @@
distclean-compile:
-rm -f *.tab.c
-@@ -418,37 +447,25 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gvimagepart.Plo at am__quote@
+@@ -712,37 +642,25 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xpm.Plo at am__quote@
.cpp.o:
- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@@ -32222,61 +21269,36 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -459,51 +476,41 @@
+@@ -753,33 +671,24 @@
distclean-libtool:
-rm -f libtool
uninstall-info-am:
--gvDATA_INSTALL = $(INSTALL_DATA)
- install-gvDATA: $(gv_DATA)
+-kde_kcfgDATA_INSTALL = $(INSTALL_DATA)
+ install-kde_kcfgDATA: $(kde_kcfg_DATA)
@$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(gvdir)
-+ test -z "$(gvdir)" || $(mkdir_p) "$(DESTDIR)$(gvdir)"
- @list='$(gv_DATA)'; for p in $$list; do \
+- $(mkinstalldirs) $(DESTDIR)$(kde_kcfgdir)
++ test -z "$(kde_kcfgdir)" || $(mkdir_p) "$(DESTDIR)$(kde_kcfgdir)"
+ @list='$(kde_kcfg_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(gvDATA_INSTALL) $$d$$p $(DESTDIR)$(gvdir)/$$f"; \
-- $(gvDATA_INSTALL) $$d$$p $(DESTDIR)$(gvdir)/$$f; \
+- echo " $(kde_kcfgDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_kcfgdir)/$$f"; \
+- $(kde_kcfgDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_kcfgdir)/$$f; \
+ f=$(am__strip_dir) \
-+ echo " $(gvDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gvdir)/$$f'"; \
-+ $(gvDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gvdir)/$$f"; \
++ echo " $(kde_kcfgDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_kcfgdir)/$$f'"; \
++ $(kde_kcfgDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_kcfgdir)/$$f"; \
done
- uninstall-gvDATA:
+ uninstall-kde_kcfgDATA:
@$(NORMAL_UNINSTALL)
- @list='$(gv_DATA)'; for p in $$list; do \
+ @list='$(kde_kcfg_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(gvdir)/$$f"; \
-- rm -f $(DESTDIR)$(gvdir)/$$f; \
+- echo " rm -f $(DESTDIR)$(kde_kcfgdir)/$$f"; \
+- rm -f $(DESTDIR)$(kde_kcfgdir)/$$f; \
+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(gvdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(gvdir)/$$f"; \
++ echo " rm -f '$(DESTDIR)$(kde_kcfgdir)/$$f'"; \
++ rm -f "$(DESTDIR)$(kde_kcfgdir)/$$f"; \
done
--kde_servicesDATA_INSTALL = $(INSTALL_DATA)
- install-kde_servicesDATA: $(kde_services_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
-+ test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
- @list='$(kde_services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
- uninstall-kde_servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_services_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-
-ETAGS = etags
-ETAGSFLAGS =
-
@@ -32288,7 +21310,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -512,6 +519,7 @@
+@@ -788,6 +697,7 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -32296,7 +21318,7 @@
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -523,10 +531,11 @@
+@@ -799,10 +709,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -32312,7 +21334,7 @@
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -549,12 +558,6 @@
+@@ -825,12 +736,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -32320,12 +21342,12 @@
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ..
+-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -568,7 +571,7 @@
+@@ -844,7 +749,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -32334,20 +21356,20 @@
else \
dir=''; \
fi; \
-@@ -586,9 +589,10 @@
+@@ -862,9 +767,10 @@
check-am: all-am
check: check-am
- all-am: Makefile $(LTLIBRARIES) $(DATA)
+ all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
-
installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(gvdir) $(DESTDIR)$(kde_servicesdir)
-+ for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(gvdir)" "$(DESTDIR)$(kde_servicesdir)"; do \
+- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(kde_kcfgdir)
++ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kde_kcfgdir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
-@@ -608,7 +612,7 @@
+@@ -884,7 +790,7 @@
clean-generic:
distclean-generic:
@@ -32356,7 +21378,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -633,6 +637,8 @@
+@@ -909,6 +815,8 @@
dvi-am:
@@ -32365,35 +21387,150 @@
info: info-am
info-am:
-@@ -677,8 +683,8 @@
+@@ -947,15 +855,16 @@
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ clean-libLTLIBRARIES clean-libtool ctags distclean \
distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-exec \
- install-exec-am install-gvDATA install-info install-info-am \
- install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
- install-man install-strip installcheck installcheck-am \
-@@ -713,7 +719,7 @@
- -rm -f gvimagepart.moc
+ install-exec-am install-info install-info-am \
+ install-kde_kcfgDATA install-libLTLIBRARIES install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
+- pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \
+- uninstall-kde_kcfgDATA uninstall-libLTLIBRARIES
++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++ pdf pdf-am ps ps-am tags uninstall uninstall-am \
++ uninstall-info-am uninstall-kde_kcfgDATA \
++ uninstall-libLTLIBRARIES
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+@@ -1013,18 +922,18 @@
+ mocs: externaltoolcontext.moc
+
+ #>+ 3
+-imagesavedialog.moc: $(srcdir)/imagesavedialog.h
+- $(MOC) $(srcdir)/imagesavedialog.h -o imagesavedialog.moc
++slideshowdialog.moc: $(srcdir)/slideshowdialog.h
++ $(MOC) $(srcdir)/slideshowdialog.h -o slideshowdialog.moc
+
#>+ 2
--KDE_DIST=Makefile.in gvimagepart.rc gvimagepart.h gvimagepart.desktop
-+KDE_DIST=Makefile.in gvimagepart.rc gvimagepart.h gvimagepart.desktop Makefile.am
+-mocs: imagesavedialog.moc
++mocs: slideshowdialog.moc
#>+ 3
- clean-closures:
-@@ -722,10 +728,19 @@
+-slideshowdialog.moc: $(srcdir)/slideshowdialog.h
+- $(MOC) $(srcdir)/slideshowdialog.h -o slideshowdialog.moc
++imagesavedialog.moc: $(srcdir)/imagesavedialog.h
++ $(MOC) $(srcdir)/imagesavedialog.h -o imagesavedialog.moc
+
#>+ 2
+-mocs: slideshowdialog.moc
++mocs: imagesavedialog.moc
+
+ #>+ 3
+ fullscreenbar.moc: $(srcdir)/fullscreenbar.h
+@@ -1055,18 +964,18 @@
+ mocs: filedetailview.moc
+
+ #>+ 3
+-busylevelmanager.moc: $(srcdir)/busylevelmanager.h
+- $(MOC) $(srcdir)/busylevelmanager.h -o busylevelmanager.moc
++threadgate.moc: $(srcdir)/threadgate.h
++ $(MOC) $(srcdir)/threadgate.h -o threadgate.moc
+
+ #>+ 2
+-mocs: busylevelmanager.moc
++mocs: threadgate.moc
+
+ #>+ 3
+-threadgate.moc: $(srcdir)/threadgate.h
+- $(MOC) $(srcdir)/threadgate.h -o threadgate.moc
++busylevelmanager.moc: $(srcdir)/busylevelmanager.h
++ $(MOC) $(srcdir)/busylevelmanager.h -o busylevelmanager.moc
+
+ #>+ 2
+-mocs: threadgate.moc
++mocs: busylevelmanager.moc
+
+ #>+ 3
+ documentloadedimpl.moc: $(srcdir)/documentloadedimpl.h
+@@ -1097,18 +1006,18 @@
+ mocs: externaltooldialog.moc
+
+ #>+ 3
+-batchmanipulator.moc: $(srcdir)/batchmanipulator.h
+- $(MOC) $(srcdir)/batchmanipulator.h -o batchmanipulator.moc
++fileviewstack.moc: $(srcdir)/fileviewstack.h
++ $(MOC) $(srcdir)/fileviewstack.h -o fileviewstack.moc
+
+ #>+ 2
+-mocs: batchmanipulator.moc
++mocs: fileviewstack.moc
+
+ #>+ 3
+-fileviewstack.moc: $(srcdir)/fileviewstack.h
+- $(MOC) $(srcdir)/fileviewstack.h -o fileviewstack.moc
++batchmanipulator.moc: $(srcdir)/batchmanipulator.h
++ $(MOC) $(srcdir)/batchmanipulator.h -o batchmanipulator.moc
+
+ #>+ 2
+-mocs: fileviewstack.moc
++mocs: batchmanipulator.moc
+
+ #>+ 3
+ externaltoolaction.moc: $(srcdir)/externaltoolaction.h
+@@ -1132,18 +1041,18 @@
+ mocs: slideshow.moc
+
+ #>+ 3
+-kipiinterface.moc: $(srcdir)/kipiinterface.h
+- $(MOC) $(srcdir)/kipiinterface.h -o kipiinterface.moc
++printdialog.moc: $(srcdir)/printdialog.h
++ $(MOC) $(srcdir)/printdialog.h -o printdialog.moc
+
+ #>+ 2
+-mocs: kipiinterface.moc
++mocs: printdialog.moc
+
+ #>+ 3
+-printdialog.moc: $(srcdir)/printdialog.h
+- $(MOC) $(srcdir)/printdialog.h -o printdialog.moc
++kipiinterface.moc: $(srcdir)/kipiinterface.h
++ $(MOC) $(srcdir)/kipiinterface.h -o kipiinterface.moc
+
+ #>+ 2
+-mocs: printdialog.moc
++mocs: kipiinterface.moc
+
+ #>+ 3
+ fileopobject.moc: $(srcdir)/fileopobject.h
+@@ -1154,10 +1063,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f documentloadingimpl.moc document.moc imageloader.moc imageview.moc thumbnaildetailsdialog.moc externaltoolcontext.moc imagesavedialog.moc slideshowdialog.moc fullscreenbar.moc documentjpegloadedimpl.moc thumbnailloadjob.moc filedetailview.moc busylevelmanager.moc threadgate.moc documentloadedimpl.moc documentanimatedloadedimpl.moc filethumbnailview.moc externaltooldialog.moc batchmanipulator.moc fileviewstack.moc externaltoolaction.moc documentimpl.moc slideshow.moc kipiinterface.moc printdialog.moc fileopobject.moc
++ -rm -f documentloadingimpl.moc document.moc imageloader.moc imageview.moc thumbnaildetailsdialog.moc externaltoolcontext.moc slideshowdialog.moc imagesavedialog.moc fullscreenbar.moc documentjpegloadedimpl.moc thumbnailloadjob.moc filedetailview.moc threadgate.moc busylevelmanager.moc documentloadedimpl.moc documentanimatedloadedimpl.moc filethumbnailview.moc externaltooldialog.moc fileviewstack.moc batchmanipulator.moc externaltoolaction.moc documentimpl.moc slideshow.moc printdialog.moc kipiinterface.moc fileopobject.moc
+
+ #>+ 2
+-KDE_DIST=printdialog.h threadgate.h externaltooldialogbase.ui externaltooldialog.h thumbnaildetailsdialogbase.ui thumbnailsize.h documentloadingimpl.h printdialogpagebase.ui filedetailview.h documentloadedimpl.h slideshow.h documentjpegloadedimpl.h kipiinterface.h fileviewstack.h captionformatterbase.h imageviewtools.h thumbnailloadjob.h slideshowdialog.h imageview.h fileopobject.h qxcfi.h fileoperation.h documentanimatedloadedimpl.h slideshowdialogbase.ui fileviewbase.h captionformatter.h externaltoolmanager.h archive.h jpegformattype.h filedetailviewitem.h filethumbnailview.h thumbnaildetailsdialog.h gvconfig.kcfg fullscreenbar.h pngformattype.h busylevelmanager.h imagesavedialog.h cache.h Makefile.in imageloader.h externaltoolcontext.h batchmanipulator.h documentimpl.h gvconfig.kcfgc filethumbnailviewitem.h mngformattype.h document.h cursortracker.h xpm.h imageframe.h externaltoolaction.h gimp.h
++KDE_DIST=threadgate.h printdialog.h externaltooldialogbase.ui externaltooldialog.h thumbnailsize.h thumbnaildetailsdialogbase.ui documentloadingimpl.h printdialogpagebase.ui filedetailview.h documentloadedimpl.h slideshow.h documentjpegloadedimpl.h fileviewstack.h kipiinterface.h captionformatterbase.h imageviewtools.h thumbnailloadjob.h slideshowdialog.h fileopobject.h imageview.h qxcfi.h fileoperation.h documentanimatedloadedimpl.h slideshowdialogbase.ui fileviewbase.h captionformatter.h externaltoolmanager.h archive.h jpegformattype.h filedetailviewitem.h filethumbnailview.h thumbnaildetailsdialog.h gvconfig.kcfg fullscreenbar.h pngformattype.h busylevelmanager.h imagesavedialog.h cache.h Makefile.in imageloader.h externaltoolcontext.h batchmanipulator.h documentimpl.h gvconfig.kcfgc filethumbnailviewitem.h mngformattype.h document.h cursortracker.h Makefile.am xpm.h imageframe.h gimp.h externaltoolaction.h
+
+ #>+ 7
+ clean-ui:
+@@ -1179,10 +1088,19 @@
+ #>+ 2
docs-am:
-#>+ 6
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu gvimagepart/Makefile
+- $(AUTOMAKE) --gnu src/gvcore/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -32402,19 +21539,28 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign gvimagepart/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/gvcore/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign gvimagepart/Makefile
- cd $(top_srcdir) && perl admin/am_edit gvimagepart/Makefile.in
++ $(AUTOMAKE) --foreign src/gvcore/Makefile
+ cd $(top_srcdir) && perl admin/am_edit src/gvcore/Makefile.in
-diff -Nru gwenview-1.2.0.orig/gvimageutils/Makefile.in gwenview-1.2.0/gvimageutils/Makefile.in
---- gwenview-1.2.0.orig/gvimageutils/Makefile.in 2005-04-03 13:19:02.000000000 +0000
-+++ gwenview-1.2.0/gvimageutils/Makefile.in 2005-07-26 19:28:12.000000000 +0000
+@@ -1209,7 +1127,7 @@
+
+
+ #>+ 11
+-libgwenviewcore_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/printdialog.cpp $(srcdir)/thumbnailloadjob.cpp $(srcdir)/imageview.cpp $(srcdir)/batchmanipulator.cpp $(srcdir)/document.cpp $(srcdir)/externaltoolmanager.cpp $(srcdir)/externaltoolcontext.cpp $(srcdir)/externaltoolaction.cpp $(srcdir)/externaltooldialog.cpp $(srcdir)/fileviewstack.cpp $(srcdir)/filethumbnailview.cpp $(srcdir)/fileoperation.cpp $(srcdir)/fileopobject.cpp $(srcdir)/filethumbnailviewitem.cpp $(srcdir)/qxcfi.cpp $(srcdir)/archive.cpp $(srcdir)/slideshow.cpp $(srcdir)/filedetailview.cpp $(srcdir)/filedetailviewitem.cpp $(srcdir)/imagesavedialog.cpp $(srcdir)/slideshowdialog.cpp $(srcdir)/jpegformattype.cpp $(srcdir)/pngformattype.cpp $(srcdir)/mngformattype.cpp $(srcdir)/xpm.cpp $(srcdir)/documentimpl.cpp $(srcdir)/documentloadingimpl.cpp $(srcdir)/documentloadedimpl.cpp $(srcdir)/documentjpegloadedimpl.cpp $(srcdir)/documentanimatedloadedimpl.cpp $(srcdir)/kipiinterface.cpp $(srcdir)/busylevelmanager.cpp $(srcdir)/cache.cpp $(srcdir)/threadgate.cpp $(srcdir)/imageviewtools.cpp $(srcdir)/fullscreenbar.cpp $(srcdir)/imageloader.cpp $(srcdir)/cursortracker.cpp $(srcdir)/captionformatter.cpp $(srcdir)/thumbnaildetailsdialog.cpp printdialogpagebase.cpp externaltooldialogbase.cpp slideshowdialogbase.cpp thumbnaildetailsdialogbase.cpp gvconfig.cpp documentloadingimpl.moc imageloader.moc document.moc imageview.moc thumbnaildetailsdialog.moc slideshowdialogbase.moc externaltoolcontext.moc slideshowdialog.moc imagesavedialog.moc fullscreenbar.moc documentjpegloadedimpl.moc externaltooldialogbase.moc thumbnailloadjob.moc filedetailview.moc documentloadedimpl.moc threadgate.moc busylevelmanager.moc documentanimatedloadedimpl.moc filethumbnailview.moc externaltooldialog.moc printdialogpagebase.moc fileviewstack.moc batchmanipulator.moc documentimpl.moc externaltoolaction.moc slideshow.moc printdialog.moc kipiinterface.moc thumbnaildetailsdialogbase.moc fileopobject.moc
++libgwenviewcore_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/printdialog.cpp $(srcdir)/thumbnailloadjob.cpp $(srcdir)/imageview.cpp $(srcdir)/batchmanipulator.cpp $(srcdir)/document.cpp $(srcdir)/externaltoolmanager.cpp $(srcdir)/externaltoolcontext.cpp $(srcdir)/externaltoolaction.cpp $(srcdir)/externaltooldialog.cpp $(srcdir)/fileviewstack.cpp $(srcdir)/filethumbnailview.cpp $(srcdir)/fileoperation.cpp $(srcdir)/fileopobject.cpp $(srcdir)/filethumbnailviewitem.cpp $(srcdir)/qxcfi.cpp $(srcdir)/archive.cpp $(srcdir)/slideshow.cpp $(srcdir)/filedetailview.cpp $(srcdir)/filedetailviewitem.cpp $(srcdir)/imagesavedialog.cpp $(srcdir)/slideshowdialog.cpp $(srcdir)/jpegformattype.cpp $(srcdir)/pngformattype.cpp $(srcdir)/mngformattype.cpp $(srcdir)/xpm.cpp $(srcdir)/documentimpl.cpp $(srcdir)/documentloadingimpl.cpp $(srcdir)/documentloadedimpl.cpp $(srcdir)/documentjpegloadedimpl.cpp $(srcdir)/documentanimatedloadedimpl.cpp $(srcdir)/kipiinterface.cpp $(srcdir)/busylevelmanager.cpp $(srcdir)/cache.cpp $(srcdir)/threadgate.cpp $(srcdir)/imageviewtools.cpp $(srcdir)/fullscreenbar.cpp $(srcdir)/imageloader.cpp $(srcdir)/cursortracker.cpp $(srcdir)/captionformatter.cpp $(srcdir)/thumbnaildetailsdialog.cpp printdialogpagebase.cpp externaltooldialogbase.cpp slideshowdialogbase.cpp thumbnaildetailsdialogbase.cpp gvconfig.cpp documentloadingimpl.moc imageloader.moc document.moc imageview.moc thumbnaildetailsdialog.moc slideshowdialogbase.moc externaltoolcontext.moc imagesavedialog.moc slideshowdialog.moc fullscreenbar.moc documentjpegloadedimpl.moc externaltooldialogbase.moc thumbnailloadjob.moc filedetailview.moc documentloadedimpl.moc busylevelmanager.moc threadgate.moc documentanimatedloadedimpl.moc filethumbnailview.moc externaltooldialog.moc printdialogpagebase.moc batchmanipulator.moc fileviewstack.moc documentimpl.moc externaltoolaction.moc slideshow.moc kipiinterface.moc printdialog.moc thumbnaildetailsdialogbase.moc fileopobject.moc
+ @echo 'creating libgwenviewcore_la.all_cpp.cpp ...'; \
+ rm -f libgwenviewcore_la.all_cpp.files libgwenviewcore_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libgwenviewcore_la.all_cpp.final; \
+diff -Nru gwenview-1.3.0.orig/src/gvdirpart/Makefile.in gwenview-1.3.0/src/gvdirpart/Makefile.in
+--- gwenview-1.3.0.orig/src/gvdirpart/Makefile.in 2005-09-11 10:40:29.000000000 -0400
++++ gwenview-1.3.0/src/gvdirpart/Makefile.in 2005-09-12 08:43:46.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -32424,32 +21570,28 @@
# 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,6 +15,9 @@
+@@ -15,6 +15,7 @@
@SET_MAKE@
+
-+SOURCES = $(libgvimageutils_la_SOURCES) $(testjpegcontent_SOURCES)
-+
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -22,7 +25,6 @@
+@@ -22,7 +23,6 @@
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
-@@ -39,6 +41,80 @@
+@@ -39,6 +39,64 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+check_PROGRAMS = testjpegcontent$(EXEEXT)
-+subdir = gvimageutils
-+DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \
-+ $(srcdir)/Makefile.in
++subdir = src/gvdirpart
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.in
@@ -32458,41 +21600,26 @@
+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
-+LTLIBRARIES = $(noinst_LTLIBRARIES)
-+libgvimageutils_la_LIBADD =
-+am_libgvimageutils_la_OBJECTS = gvimageutils.lo jpegcontent.lo \
-+ scale.lo transupp.lo asm_scale.lo
-+#>- libgvimageutils_la_OBJECTS = $(am_libgvimageutils_la_OBJECTS)
-+#>+ 5
-+libgvimageutils_la_final_OBJECTS = asm_scale.lo transupp.lo libgvimageutils_la.all_cpp.lo
-+libgvimageutils_la_nofinal_OBJECTS = gvimageutils.lo jpegcontent.lo \
-+ scale.lo transupp.lo asm_scale.lo
-+ at KDE_USE_FINAL_FALSE@libgvimageutils_la_OBJECTS = $(libgvimageutils_la_nofinal_OBJECTS)
-+ at KDE_USE_FINAL_TRUE@libgvimageutils_la_OBJECTS = $(libgvimageutils_la_final_OBJECTS)
-+am_testjpegcontent_OBJECTS = testjpegcontent.$(OBJEXT)
-+#>- testjpegcontent_OBJECTS = $(am_testjpegcontent_OBJECTS)
++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)$(kde_moduledir)" "$(DESTDIR)$(gvdir)" \
++ "$(DESTDIR)$(kde_servicesdir)"
++kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(kde_module_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++libgvdirpart_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++ ../gvcore/libgwenviewcore.la
++am_libgvdirpart_la_OBJECTS = gvdirpart.lo
++#>- libgvdirpart_la_OBJECTS = $(am_libgvdirpart_la_OBJECTS)
+#>+ 1
-+testjpegcontent_OBJECTS = testjpegcontent.$(OBJEXT)
-+am__DEPENDENCIES_1 =
-+testjpegcontent_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+ $(am__DEPENDENCIES_1) libgvimageutils.la \
-+ ../libgvexif/libgvexif.la
++libgvdirpart_la_OBJECTS = gvdirpart.lo
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+am__depfiles_maybe = depfiles
-+CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
-+LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) \
-+ $(CCASFLAGS)
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 2
@@ -32511,10 +21638,11 @@
+#>+ 2
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libgvimageutils_la_SOURCES) $(testjpegcontent_SOURCES)
-+DIST_SOURCES = $(libgvimageutils_la_SOURCES) \
-+ $(testjpegcontent_SOURCES)
-+HEADERS = $(noinst_HEADERS)
++SOURCES = $(libgvdirpart_la_SOURCES)
++DIST_SOURCES = $(libgvdirpart_la_SOURCES)
++gvDATA_INSTALL = $(INSTALL_DATA)
++kde_servicesDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(gv_DATA) $(kde_services_DATA)
+ETAGS = etags
+CTAGS = ctags
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -32523,15 +21651,7 @@
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +187,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +226,9 @@
+@@ -164,6 +222,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -32541,7 +21661,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +285,8 @@
+@@ -222,6 +283,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -32550,147 +21670,47 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +294,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +332,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +336,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -300,9 +357,7 @@
- xdg_menudir = @xdg_menudir@
- AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. $(all_includes)
- AM_CCASFLAGS = -I$(srcdir) $(GV_ASM_DEFS)
+@@ -302,7 +366,6 @@
+ # These are not really libraries, but modules dynamically opened.
+ # So they should be installed in kde_module_dir, which is usually $kde_prefix/lib/kde3
+ kde_module_LTLIBRARIES = libgvdirpart.la
-
- noinst_LTLIBRARIES = libgvimageutils.la
--
- libgvimageutils_la_SOURCES = \
- gvimageutils.cpp \
- jpegcontent.cpp \
-@@ -310,7 +365,6 @@
- transupp.c \
- asm_scale.S
+ libgvdirpart_la_SOURCES = gvdirpart.cpp
+ libgvdirpart_la_LIBADD = $(LIB_KPARTS) ../gvcore/libgwenviewcore.la
+ libgvdirpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+@@ -316,91 +379,79 @@
+ # Install the .desktop file into the kde_services directory
+ kde_services_DATA = gvdirpart.desktop
-
- noinst_HEADERS = \
- orientation.h \
- gvimageutils.h \
-@@ -319,114 +373,67 @@
- jpegint.h \
- transupp.h
-
--
- #>- METASOURCES = AUTO
--
--check_PROGRAMS = testjpegcontent
- testjpegcontent_SOURCES = testjpegcontent.cpp
- testjpegcontent_LDADD = \
- $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KDEPRINT) $(LIB_QT) \
- $(LIBJPEG) libgvimageutils.la ../libgvexif/libgvexif.la
-
- testjpegcontent_LDFLAGS = $(all_libraries)
--subdir = gvimageutils
+ KDE_ICON = AUTO
+-subdir = src/gvdirpart
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
--LTLIBRARIES = $(noinst_LTLIBRARIES)
+-LTLIBRARIES = $(kde_module_LTLIBRARIES)
-
--libgvimageutils_la_LDFLAGS =
--libgvimageutils_la_LIBADD =
--am_libgvimageutils_la_OBJECTS = gvimageutils.lo jpegcontent.lo scale.lo \
-- transupp.lo asm_scale.lo
--#>- libgvimageutils_la_OBJECTS = $(am_libgvimageutils_la_OBJECTS)
--#>+ 5
--libgvimageutils_la_final_OBJECTS = asm_scale.lo transupp.lo libgvimageutils_la.all_cpp.lo
--libgvimageutils_la_nofinal_OBJECTS = gvimageutils.lo jpegcontent.lo scale.lo \
-- transupp.lo asm_scale.lo
-- at KDE_USE_FINAL_FALSE@libgvimageutils_la_OBJECTS = $(libgvimageutils_la_nofinal_OBJECTS)
-- at KDE_USE_FINAL_TRUE@libgvimageutils_la_OBJECTS = $(libgvimageutils_la_final_OBJECTS)
--check_PROGRAMS = testjpegcontent$(EXEEXT)
--am_testjpegcontent_OBJECTS = testjpegcontent.$(OBJEXT)
--#>- testjpegcontent_OBJECTS = $(am_testjpegcontent_OBJECTS)
+-libgvdirpart_la_DEPENDENCIES = ../gvcore/libgwenviewcore.la
+-am_libgvdirpart_la_OBJECTS = gvdirpart.lo
+-#>- libgvdirpart_la_OBJECTS = $(am_libgvdirpart_la_OBJECTS)
-#>+ 1
--testjpegcontent_OBJECTS = testjpegcontent.$(OBJEXT)
--testjpegcontent_DEPENDENCIES = libgvimageutils.la \
-- ../libgvexif/libgvexif.la
+-libgvdirpart_la_OBJECTS = gvdirpart.lo
-
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-am__depfiles_maybe = depfiles
--#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/gvimageutils.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/jpegcontent.Plo ./$(DEPDIR)/scale.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/testjpegcontent.Po \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/transupp.Plo
--#>+ 8
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libgvimageutils_la.all_cpp.P ./$(DEPDIR)/gvimageutils.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/jpegcontent.Plo ./$(DEPDIR)/scale.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testjpegcontent.Po \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/transupp.Plo
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/gvimageutils.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/jpegcontent.Plo ./$(DEPDIR)/scale.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/testjpegcontent.Po \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/transupp.Plo
--CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
--LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) \
-- $(CCASFLAGS)
--COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/gvdirpart.Plo
+-#>+ 1
+- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gvdirpart.Plo
-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 2
@@ -32709,19 +21729,18 @@
-#>+ 2
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(libgvimageutils_la_SOURCES) $(testjpegcontent_SOURCES)
--HEADERS = $(noinst_HEADERS)
+-DIST_SOURCES = $(libgvdirpart_la_SOURCES)
+-DATA = $(gv_DATA) $(kde_services_DATA)
-
--DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.in \
-- Makefile.am
--SOURCES = $(libgvimageutils_la_SOURCES) $(testjpegcontent_SOURCES)
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-SOURCES = $(libgvdirpart_la_SOURCES)
-
#>- all: all-am
#>+ 1
all: docs-am all-am
.SUFFIXES:
- .SUFFIXES: .S .c .cpp .lo .o .obj
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+#>- @for dep in $?; do \
@@ -32732,11 +21751,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign gvimageutils/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/gvdirpart/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu gvimageutils/Makefile
+-#>- $(AUTOMAKE) --gnu src/gvdirpart/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign gvimageutils/Makefile
++#>- $(AUTOMAKE) --foreign src/gvdirpart/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -32746,13 +21765,14 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign gvimageutils/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/gvdirpart/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu gvimageutils/Makefile
-+ $(AUTOMAKE) --foreign gvimageutils/Makefile
- cd $(top_srcdir) && perl admin/am_edit gvimageutils/Makefile.in
+- $(AUTOMAKE) --gnu src/gvdirpart/Makefile
++ $(AUTOMAKE) --foreign src/gvdirpart/Makefile
+ cd $(top_srcdir) && perl admin/am_edit src/gvdirpart/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
@@ -32770,18 +21790,44 @@
+ 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-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
++ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f="`echo $$p | sed -e 's|^.*/||'`"; \
+- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
+- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
++ f=$(am__strip_dir) \
++ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
++ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+ done
- clean-noinstLTLIBRARIES:
- -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
- @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p="`echo $$p | sed -e 's|^.*/||'`"; \
+- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
+- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
++ @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p=$(am__strip_dir) \
++ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
++ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+
+ clean-kde_moduleLTLIBRARIES:
+ -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" = "$$p" && dir=.; \
+ test "$$dir" != "$$p" || dir=.; \
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-@@ -444,7 +451,7 @@
- $(CXXLINK) $(testjpegcontent_LDFLAGS) $(testjpegcontent_OBJECTS) $(testjpegcontent_LDADD) $(LIBS)
+@@ -411,7 +462,7 @@
+ $(CXXLINK) -rpath $(kde_moduledir) $(libgvdirpart_la_LDFLAGS) $(libgvdirpart_la_OBJECTS) $(libgvdirpart_la_LIBADD) $(LIBS)
mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
@@ -32789,66 +21835,9 @@
distclean-compile:
-rm -f *.tab.c
-@@ -456,79 +463,55 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/transupp.Plo at am__quote@
+@@ -419,37 +470,25 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gvdirpart.Plo at am__quote@
- .S.o:
-- $(CCASCOMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
-+ $(CCASCOMPILE) -c $<
-
- .S.obj:
-- $(CCASCOMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-+ $(CCASCOMPILE) -c `$(CYGPATH_W) '$<'`
-
- .S.lo:
-- $(LTCCASCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ $(LTCCASCOMPILE) -c -o $@ $<
-
- .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@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @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@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @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@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @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 $@ $<
-
.cpp.o:
- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
@@ -32896,10 +21885,61 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -540,14 +523,6 @@
+@@ -460,51 +499,41 @@
+ distclean-libtool:
-rm -f libtool
uninstall-info-am:
+-gvDATA_INSTALL = $(INSTALL_DATA)
+ install-gvDATA: $(gv_DATA)
+ @$(NORMAL_INSTALL)
+- $(mkinstalldirs) $(DESTDIR)$(gvdir)
++ test -z "$(gvdir)" || $(mkdir_p) "$(DESTDIR)$(gvdir)"
+ @list='$(gv_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f="`echo $$p | sed -e 's|^.*/||'`"; \
+- echo " $(gvDATA_INSTALL) $$d$$p $(DESTDIR)$(gvdir)/$$f"; \
+- $(gvDATA_INSTALL) $$d$$p $(DESTDIR)$(gvdir)/$$f; \
++ f=$(am__strip_dir) \
++ echo " $(gvDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gvdir)/$$f'"; \
++ $(gvDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gvdir)/$$f"; \
+ done
+ uninstall-gvDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(gv_DATA)'; for p in $$list; do \
+- f="`echo $$p | sed -e 's|^.*/||'`"; \
+- echo " rm -f $(DESTDIR)$(gvdir)/$$f"; \
+- rm -f $(DESTDIR)$(gvdir)/$$f; \
++ f=$(am__strip_dir) \
++ echo " rm -f '$(DESTDIR)$(gvdir)/$$f'"; \
++ rm -f "$(DESTDIR)$(gvdir)/$$f"; \
+ done
+-kde_servicesDATA_INSTALL = $(INSTALL_DATA)
+ install-kde_servicesDATA: $(kde_services_DATA)
+ @$(NORMAL_INSTALL)
+- $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
++ test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ @list='$(kde_services_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f="`echo $$p | sed -e 's|^.*/||'`"; \
+- echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
+- $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
++ f=$(am__strip_dir) \
++ echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++ $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ done
+
+ uninstall-kde_servicesDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kde_services_DATA)'; for p in $$list; do \
+- f="`echo $$p | sed -e 's|^.*/||'`"; \
+- echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
+- rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
++ f=$(am__strip_dir) \
++ echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++ rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ done
+
-ETAGS = etags
-ETAGSFLAGS =
-
@@ -32911,7 +21951,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -556,6 +531,7 @@
+@@ -513,6 +542,7 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -32919,7 +21959,7 @@
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -567,10 +543,11 @@
+@@ -524,10 +554,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -32935,7 +21975,7 @@
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -593,12 +570,6 @@
+@@ -550,12 +581,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -32943,12 +21983,12 @@
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ..
+-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -612,7 +583,7 @@
+@@ -569,7 +594,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -32957,15 +21997,20 @@
else \
dir=''; \
fi; \
-@@ -631,7 +602,6 @@
- $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
+@@ -587,9 +612,10 @@
+ check-am: all-am
check: check-am
- all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+ all-am: Makefile $(LTLIBRARIES) $(DATA)
-
installdirs:
+- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(gvdir) $(DESTDIR)$(kde_servicesdir)
++ for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(gvdir)" "$(DESTDIR)$(kde_servicesdir)"; do \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
++ done
install: install-am
install-exec: install-exec-am
-@@ -652,7 +622,7 @@
+ install-data: install-data-am
+@@ -609,7 +635,7 @@
clean-generic:
distclean-generic:
@@ -32974,7 +22019,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -677,6 +647,8 @@
+@@ -634,6 +660,8 @@
dvi-am:
@@ -32983,48 +22028,77 @@
info: info-am
info-am:
-@@ -711,31 +683,41 @@
-
- uninstall-am: uninstall-info-am
-
--.PHONY: CTAGS GTAGS all all-am check check-am clean clean-checkPROGRAMS \
-- clean-generic clean-libtool clean-noinstLTLIBRARIES ctags \
-- distclean distclean-compile distclean-generic distclean-libtool \
+@@ -681,8 +709,8 @@
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
-- install-exec-am install-info install-info-am install-man \
-- 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
-+.PHONY: CTAGS GTAGS all all-am check check-am clean \
-+ clean-checkPROGRAMS clean-generic clean-libtool \
-+ clean-noinstLTLIBRARIES ctags 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-exec install-exec-am \
-+ install-info install-info-am install-man install-strip \
-+ installcheck installcheck-am installdirs maintainer-clean \
-+ maintainer-clean-generic mostlyclean mostlyclean-compile \
-+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+ tags uninstall uninstall-am uninstall-info-am
++ distclean-tags distdir dvi dvi-am html html-am info info-am \
++ install install-am install-data install-data-am install-exec \
+ install-exec-am install-gvDATA install-info install-info-am \
+ install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
+ install-man install-strip installcheck installcheck-am \
+@@ -717,7 +745,7 @@
+ -rm -f gvdirpart.moc
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
#>+ 2
--KDE_DIST=Makefile.in tags orient6.jpg
-+KDE_DIST=Makefile.in orient6.jpg Makefile.am
+-KDE_DIST=gvdirpart.rc gvdirpart.h gvdirpart.desktop hi16-app-gvdirpart.png hi22-app-gvdirpart.png cr32-app-gvdirpart.png crsc-app-gvdirpart.svg hisc-app-gvdirpart.svg Makefile.in hi32-app-gvdirpart.png cr22-app-gvdirpart.png cr16-app-gvdirpart.png
++KDE_DIST=gvdirpart.rc gvdirpart.h gvdirpart.desktop hi16-app-gvdirpart.png hi22-app-gvdirpart.png cr32-app-gvdirpart.png crsc-app-gvdirpart.svg hisc-app-gvdirpart.svg Makefile.in hi32-app-gvdirpart.png cr22-app-gvdirpart.png Makefile.am cr16-app-gvdirpart.png
- #>+ 2
- docs-am:
+ #>+ 3
+ clean-closures:
+@@ -728,37 +756,46 @@
+ #>+ 28
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+- $(INSTALL_DATA) $(srcdir)/hisc-app-gvdirpart.svg $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/gvdirpart.svg
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-gvdirpart.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/gvdirpart.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
+- $(INSTALL_DATA) $(srcdir)/crsc-app-gvdirpart.svg $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/gvdirpart.svg
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-gvdirpart.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/gvdirpart.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-gvdirpart.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gvdirpart.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-gvdirpart.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/gvdirpart.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/cr22-app-gvdirpart.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/gvdirpart.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/cr32-app-gvdirpart.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gvdirpart.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-gvdirpart.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gvdirpart.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-gvdirpart.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/gvdirpart.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
++ $(INSTALL_DATA) $(srcdir)/crsc-app-gvdirpart.svg $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/gvdirpart.svg
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-gvdirpart.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/gvdirpart.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
++ $(INSTALL_DATA) $(srcdir)/hisc-app-gvdirpart.svg $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/gvdirpart.svg
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/gvdirpart.svg
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/gvdirpart.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/gvdirpart.svg
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/gvdirpart.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gvdirpart.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/gvdirpart.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/gvdirpart.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gvdirpart.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gvdirpart.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/gvdirpart.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/gvdirpart.svg
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/gvdirpart.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/gvdirpart.svg
+
-#>+ 6
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu gvimageutils/Makefile
+- $(AUTOMAKE) --gnu src/gvdirpart/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -33033,19 +22107,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign gvimageutils/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/gvdirpart/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign gvimageutils/Makefile
- cd $(top_srcdir) && perl admin/am_edit gvimageutils/Makefile.in
++ $(AUTOMAKE) --foreign src/gvdirpart/Makefile
+ cd $(top_srcdir) && perl admin/am_edit src/gvdirpart/Makefile.in
-diff -Nru gwenview-1.2.0.orig/gwenviewapp/Makefile.in gwenview-1.2.0/gwenviewapp/Makefile.in
---- gwenview-1.2.0.orig/gwenviewapp/Makefile.in 2005-04-03 13:19:02.000000000 +0000
-+++ gwenview-1.2.0/gwenviewapp/Makefile.in 2005-07-26 19:28:12.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/src/gvimagepart/Makefile.in gwenview-1.3.0/src/gvimagepart/Makefile.in
+--- gwenview-1.3.0.orig/src/gvimagepart/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/src/gvimagepart/Makefile.in 2005-09-12 08:43:46.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -33055,33 +22129,27 @@
# 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,6 +15,12 @@
+@@ -15,6 +15,7 @@
@SET_MAKE@
+
-+
-+#>- SOURCES = $(gwenview_la_SOURCES)
-+#>+ 1
-+SOURCES = $(gwenview_la_SOURCES) $(gwenview_SOURCES)
-+
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -22,7 +28,6 @@
+@@ -22,7 +23,6 @@
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
-@@ -39,6 +44,74 @@
+@@ -39,6 +39,64 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+bin_PROGRAMS =
-+subdir = gwenviewapp
++subdir = src/gvimagepart
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -33097,25 +22165,17 @@
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" \
-+ "$(DESTDIR)$(bindir)" "$(DESTDIR)$(rcdir)"
-+kdeinitLTLIBRARIES_INSTALL = $(INSTALL)
-+libLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(kdeinit_LTLIBRARIES) $(lib_LTLIBRARIES)
-+#>- gwenview_la_DEPENDENCIES = ../src/libgwenviewcore.la
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(gvdir)" \
++ "$(DESTDIR)$(kde_servicesdir)"
++kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(kde_module_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++libgvimagepart_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++ ../gvcore/libgwenviewcore.la
++am_libgvimagepart_la_OBJECTS = gvimagepart.lo
++#>- libgvimagepart_la_OBJECTS = $(am_libgvimagepart_la_OBJECTS)
+#>+ 1
-+gwenview_la_DEPENDENCIES = libkdeinit_gwenview.la
-+#>- am_gwenview_la_OBJECTS = dummy.lo
-+#>+ 1
-+am_gwenview_la_OBJECTS = gwenview_dummy.lo
-+#>- gwenview_la_OBJECTS = $(am_gwenview_la_OBJECTS)
-+#>+ 1
-+gwenview_la_OBJECTS = gwenview_dummy.lo
-+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-+#>- PROGRAMS = $(bin_PROGRAMS)
-+#>+ 2
-+bin_PROGRAMS += gwenview$(EXEEXT)
-+PROGRAMS = $(bin_PROGRAMS)
++libgvimagepart_la_OBJECTS = gvimagepart.lo
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+am__depfiles_maybe = depfiles
@@ -33137,12 +22197,11 @@
+#>+ 2
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(gwenview_la_SOURCES)
-+#>- DIST_SOURCES = $(gwenview_la_SOURCES)
-+#>+ 1
-+DIST_SOURCES = $(gwenview_la_SOURCES) $(gwenview_SOURCES)
-+rcDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(rc_DATA)
++SOURCES = $(libgvimagepart_la_SOURCES)
++DIST_SOURCES = $(libgvimagepart_la_SOURCES)
++gvDATA_INSTALL = $(INSTALL_DATA)
++kde_servicesDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(gv_DATA) $(kde_services_DATA)
+ETAGS = etags
+CTAGS = ctags
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -33151,15 +22210,7 @@
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +184,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +223,9 @@
+@@ -164,6 +222,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -33169,7 +22220,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +282,8 @@
+@@ -222,6 +283,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -33178,119 +22229,45 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +291,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +329,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +336,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,15 +352,11 @@
- xdg_appsdir = @xdg_appsdir@
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
--bin_PROGRAMS =
- #>- lib_LTLIBRARIES =
- #>+ 1
- lib_LTLIBRARIES = libkdeinit_gwenview.la
+@@ -302,7 +366,6 @@
+ # These are not really libraries, but modules dynamically opened.
+ # So they should be installed in kde_module_dir, which is usually $kde_prefix/lib/kde3
+ kde_module_LTLIBRARIES = libgvimagepart.la
-
- kdeinit_LTLIBRARIES = gwenview.la
--
- gwenview_la_SOURCES = dummy.cpp
--
- #>- gwenview_la_LIBADD = ../src/libgwenviewcore.la
- #>+ 1
- gwenview_la_LIBADD = libkdeinit_gwenview.la
-@@ -316,138 +366,109 @@
+ libgvimagepart_la_SOURCES = gvimagepart.cpp
+ libgvimagepart_la_LIBADD = $(LIB_KPARTS) ../gvcore/libgwenviewcore.la
+ libgvimagepart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+@@ -316,89 +379,78 @@
- # set the include path for X, qt and KDE
- INCLUDES = -I$(srcdir)/.. $(all_includes)
--
- #>- METASOURCES = AUTO
--
- rcdir = $(kde_datadir)/gwenview
- rc_DATA = gwenviewui.rc
--
- CLEANFILES = dummy.cpp gwenview_dummy.cpp gwenview.la.cpp
--subdir = gwenviewapp
+ # Install the .desktop file into the kde_services directory
+ kde_services_DATA = gvimagepart.desktop
+-subdir = src/gvimagepart
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
--LTLIBRARIES = $(kdeinit_LTLIBRARIES) $(lib_LTLIBRARIES)
+-LTLIBRARIES = $(kde_module_LTLIBRARIES)
-
--#>- gwenview_la_DEPENDENCIES = ../src/libgwenviewcore.la
+-libgvimagepart_la_DEPENDENCIES = ../gvcore/libgwenviewcore.la
+-am_libgvimagepart_la_OBJECTS = gvimagepart.lo
+-#>- libgvimagepart_la_OBJECTS = $(am_libgvimagepart_la_OBJECTS)
-#>+ 1
--gwenview_la_DEPENDENCIES = libkdeinit_gwenview.la
--#>- am_gwenview_la_OBJECTS = dummy.lo
--#>+ 1
--am_gwenview_la_OBJECTS = gwenview_dummy.lo
--#>- gwenview_la_OBJECTS = $(am_gwenview_la_OBJECTS)
--#>+ 1
--gwenview_la_OBJECTS = gwenview_dummy.lo
--bin_PROGRAMS =
--#>- PROGRAMS = $(bin_PROGRAMS)
--#>+ 2
--bin_PROGRAMS += gwenview$(EXEEXT)
--PROGRAMS = $(bin_PROGRAMS)
+-libgvimagepart_la_OBJECTS = gvimagepart.lo
-
--
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-am__depfiles_maybe = depfiles
--#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/dummy.Plo
+-#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/gvimagepart.Plo
-#>+ 1
-- at AMDEP_TRUE@DEP_FILES = $(DEPDIR)/gwenview.la.Po $(DEPDIR)/gwenview_dummy.Plo ./$(DEPDIR)/dummy.Plo
+- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gvimagepart.Plo
-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 2
@@ -33309,15 +22286,11 @@
-#>+ 2
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>- DIST_SOURCES = $(gwenview_la_SOURCES)
--#>+ 1
--DIST_SOURCES = $(gwenview_la_SOURCES) $(gwenview_SOURCES)
--DATA = $(rc_DATA)
+-DIST_SOURCES = $(libgvimagepart_la_SOURCES)
+-DATA = $(gv_DATA) $(kde_services_DATA)
-
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--#>- SOURCES = $(gwenview_la_SOURCES)
--#>+ 1
--SOURCES = $(gwenview_la_SOURCES) $(gwenview_SOURCES)
+-SOURCES = $(libgvimagepart_la_SOURCES)
-
#>- all: all-am
#>+ 1
@@ -33335,11 +22308,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign gwenviewapp/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/gvimagepart/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu gwenviewapp/Makefile
+-#>- $(AUTOMAKE) --gnu src/gvimagepart/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign gwenviewapp/Makefile
++#>- $(AUTOMAKE) --foreign src/gvimagepart/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -33349,14 +22322,14 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign gwenviewapp/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/gvimagepart/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu gwenviewapp/Makefile
-+ $(AUTOMAKE) --foreign gwenviewapp/Makefile
- cd $(top_srcdir) && perl admin/am_edit gwenviewapp/Makefile.in
+- $(AUTOMAKE) --gnu src/gvimagepart/Makefile
++ $(AUTOMAKE) --foreign src/gvimagepart/Makefile
+ cd $(top_srcdir) && perl admin/am_edit src/gvimagepart/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
--kdeinitLTLIBRARIES_INSTALL = $(INSTALL)
+-kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
@@ -33374,123 +22347,53 @@
+ 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-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kdeinitdir)
-+ test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
- @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
++ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kdeinitdir)/$$f"; \
-- $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kdeinitdir)/$$f; \
+- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
+- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
+ f=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kdeinitdir)/$$f'"; \
-+ $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kdeinitdir)/$$f"; \
++ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
++ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
else :; fi; \
done
- uninstall-kdeinitLTLIBRARIES:
+ uninstall-kde_moduleLTLIBRARIES:
@$(NORMAL_UNINSTALL)
-- @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- p="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kdeinitdir)/$$p"; \
-- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kdeinitdir)/$$p; \
-+ @set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
+- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
++ @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
-+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
++ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
done
- clean-kdeinitLTLIBRARIES:
- -test -z "$(kdeinit_LTLIBRARIES)" || rm -f $(kdeinit_LTLIBRARIES)
- @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+ clean-kde_moduleLTLIBRARIES:
+ -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" = "$$p" && dir=.; \
+ test "$$dir" != "$$p" || dir=.; \
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
--libLTLIBRARIES_INSTALL = $(INSTALL)
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(libdir)
-+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
-- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
- done
+@@ -409,7 +461,7 @@
+ $(CXXLINK) -rpath $(kde_moduledir) $(libgvimagepart_la_LDFLAGS) $(libgvimagepart_la_OBJECTS) $(libgvimagepart_la_LIBADD) $(LIBS)
- 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; \
-+ @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-+ $(LIBTOOL) --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
-@@ -456,18 +477,17 @@
- @KDE_USE_CLOSURE_TRUE at gwenview.la: gwenview.la.closure $(gwenview_la_OBJECTS) $(gwenview_la_DEPENDENCIES)
- @KDE_USE_CLOSURE_FALSE at gwenview.la: $(gwenview_la_OBJECTS) $(gwenview_la_DEPENDENCIES)
- $(CXXLINK) -rpath $(kdeinitdir) $(gwenview_la_LDFLAGS) $(gwenview_la_OBJECTS) $(gwenview_la_LIBADD) $(LIBS)
--binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- install-binPROGRAMS: $(bin_PROGRAMS)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(bindir)
-+ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- if test -f $$p \
- || test -f $$p1 \
- ; then \
- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
-- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
-+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
- else :; fi; \
- done
-
-@@ -475,8 +495,8 @@
- @$(NORMAL_UNINSTALL)
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-- echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
-- rm -f $(DESTDIR)$(bindir)/$$f; \
-+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(bindir)/$$f"; \
- done
-
- clean-binPROGRAMS:
-@@ -487,7 +507,7 @@
- done
-
mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
+ -rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
-@@ -495,37 +515,25 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dummy.Plo at am__quote@
+@@ -417,37 +469,25 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gvimagepart.Plo at am__quote@
.cpp.o:
- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@@ -33539,36 +22442,61 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -536,33 +544,24 @@
+@@ -458,51 +498,41 @@
distclean-libtool:
-rm -f libtool
uninstall-info-am:
--rcDATA_INSTALL = $(INSTALL_DATA)
- install-rcDATA: $(rc_DATA)
+-gvDATA_INSTALL = $(INSTALL_DATA)
+ install-gvDATA: $(gv_DATA)
@$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(rcdir)
-+ test -z "$(rcdir)" || $(mkdir_p) "$(DESTDIR)$(rcdir)"
- @list='$(rc_DATA)'; for p in $$list; do \
+- $(mkinstalldirs) $(DESTDIR)$(gvdir)
++ test -z "$(gvdir)" || $(mkdir_p) "$(DESTDIR)$(gvdir)"
+ @list='$(gv_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(rcDATA_INSTALL) $$d$$p $(DESTDIR)$(rcdir)/$$f"; \
-- $(rcDATA_INSTALL) $$d$$p $(DESTDIR)$(rcdir)/$$f; \
+- echo " $(gvDATA_INSTALL) $$d$$p $(DESTDIR)$(gvdir)/$$f"; \
+- $(gvDATA_INSTALL) $$d$$p $(DESTDIR)$(gvdir)/$$f; \
+ f=$(am__strip_dir) \
-+ echo " $(rcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(rcdir)/$$f'"; \
-+ $(rcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(rcdir)/$$f"; \
++ echo " $(gvDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gvdir)/$$f'"; \
++ $(gvDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gvdir)/$$f"; \
done
- uninstall-rcDATA:
+ uninstall-gvDATA:
@$(NORMAL_UNINSTALL)
- @list='$(rc_DATA)'; for p in $$list; do \
+ @list='$(gv_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(rcdir)/$$f"; \
-- rm -f $(DESTDIR)$(rcdir)/$$f; \
+- echo " rm -f $(DESTDIR)$(gvdir)/$$f"; \
+- rm -f $(DESTDIR)$(gvdir)/$$f; \
+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(rcdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(rcdir)/$$f"; \
++ echo " rm -f '$(DESTDIR)$(gvdir)/$$f'"; \
++ rm -f "$(DESTDIR)$(gvdir)/$$f"; \
done
+-kde_servicesDATA_INSTALL = $(INSTALL_DATA)
+ install-kde_servicesDATA: $(kde_services_DATA)
+ @$(NORMAL_INSTALL)
+- $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
++ test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ @list='$(kde_services_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f="`echo $$p | sed -e 's|^.*/||'`"; \
+- echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
+- $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
++ f=$(am__strip_dir) \
++ echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++ $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ done
+ uninstall-kde_servicesDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kde_services_DATA)'; for p in $$list; do \
+- f="`echo $$p | sed -e 's|^.*/||'`"; \
+- echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
+- rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
++ f=$(am__strip_dir) \
++ echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++ rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ done
+
-ETAGS = etags
-ETAGSFLAGS =
-
@@ -33580,7 +22508,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -571,6 +570,7 @@
+@@ -511,6 +541,7 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -33588,7 +22516,7 @@
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -582,10 +582,11 @@
+@@ -522,10 +553,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -33604,7 +22532,7 @@
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -608,12 +609,6 @@
+@@ -548,12 +580,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -33612,12 +22540,12 @@
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ..
+-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -627,7 +622,7 @@
+@@ -567,7 +593,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -33626,21 +22554,21 @@
else \
dir=''; \
fi; \
-@@ -647,9 +642,10 @@
- all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
- install-binPROGRAMS: install-libLTLIBRARIES
-
+@@ -585,9 +611,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(DATA)
-
installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(kdeinitdir) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(rcdir)
-+ for dir in "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(rcdir)"; do \
+- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(gvdir) $(DESTDIR)$(kde_servicesdir)
++ for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(gvdir)" "$(DESTDIR)$(kde_servicesdir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
-@@ -670,7 +666,7 @@
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+@@ -607,7 +634,7 @@
+ clean-generic:
distclean-generic:
- -rm -f $(CONFIG_CLEAN_FILES)
@@ -33648,7 +22576,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -695,6 +691,8 @@
+@@ -632,6 +659,8 @@
dvi-am:
@@ -33657,44 +22585,27 @@
info: info-am
info-am:
-@@ -735,16 +733,17 @@
- clean-generic clean-kdeinitLTLIBRARIES clean-libLTLIBRARIES \
- clean-libtool ctags distclean distclean-compile \
- distclean-generic distclean-libtool distclean-tags distdir dvi \
-- dvi-am info info-am install install-am install-binPROGRAMS \
-- install-data install-data-am install-exec install-exec-am \
-- install-info install-info-am install-kdeinitLTLIBRARIES \
-- install-libLTLIBRARIES install-man install-rcDATA install-strip \
-- installcheck installcheck-am installdirs maintainer-clean \
-- maintainer-clean-generic mostlyclean mostlyclean-compile \
-- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-- tags uninstall uninstall-am uninstall-binPROGRAMS \
-- uninstall-info-am uninstall-kdeinitLTLIBRARIES \
-- uninstall-libLTLIBRARIES uninstall-rcDATA
-+ dvi-am html html-am info info-am install install-am \
-+ install-binPROGRAMS install-data install-data-am install-exec \
-+ install-exec-am install-info install-info-am \
-+ install-kdeinitLTLIBRARIES install-libLTLIBRARIES install-man \
-+ install-rcDATA install-strip installcheck installcheck-am \
-+ installdirs maintainer-clean maintainer-clean-generic \
-+ mostlyclean mostlyclean-compile mostlyclean-generic \
-+ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-+ uninstall-am uninstall-binPROGRAMS uninstall-info-am \
-+ uninstall-kdeinitLTLIBRARIES uninstall-libLTLIBRARIES \
-+ uninstall-rcDATA
+@@ -676,8 +705,8 @@
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am info info-am install \
+- install-am install-data install-data-am install-exec \
++ distclean-tags distdir dvi dvi-am html html-am info info-am \
++ install install-am install-data install-data-am install-exec \
+ install-exec-am install-gvDATA install-info install-info-am \
+ install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
+ install-man install-strip installcheck installcheck-am \
+@@ -712,7 +741,7 @@
+ -rm -f gvimagepart.moc
-
- dummy.cpp:
-@@ -788,7 +787,7 @@
-
-
#>+ 2
--KDE_DIST=gwenviewui.rc Makefile.in
-+KDE_DIST=gwenviewui.rc Makefile.in Makefile.am
+-KDE_DIST=gvimagepart.desktop gvimagepart.rc Makefile.in gvimagepart.h
++KDE_DIST=gvimagepart.desktop gvimagepart.rc Makefile.in gvimagepart.h Makefile.am
#>+ 3
clean-closures:
-@@ -797,10 +796,19 @@
+@@ -721,10 +750,19 @@
#>+ 2
docs-am:
@@ -33702,7 +22613,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu gwenviewapp/Makefile
+- $(AUTOMAKE) --gnu src/gvimagepart/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -33711,19 +22622,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign gwenviewapp/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/gvimagepart/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign gwenviewapp/Makefile
- cd $(top_srcdir) && perl admin/am_edit gwenviewapp/Makefile.in
++ $(AUTOMAKE) --foreign src/gvimagepart/Makefile
+ cd $(top_srcdir) && perl admin/am_edit src/gvimagepart/Makefile.in
-diff -Nru gwenview-1.2.0.orig/libgvcompat/Makefile.in gwenview-1.2.0/libgvcompat/Makefile.in
---- gwenview-1.2.0.orig/libgvcompat/Makefile.in 2005-04-03 13:19:02.000000000 +0000
-+++ gwenview-1.2.0/libgvcompat/Makefile.in 2005-07-26 19:28:12.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/src/imageutils/Makefile.in gwenview-1.3.0/src/imageutils/Makefile.in
+--- gwenview-1.3.0.orig/src/imageutils/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/src/imageutils/Makefile.in 2005-09-12 08:43:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -33733,30 +22644,29 @@
# 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,6 +15,9 @@
+@@ -15,6 +15,7 @@
@SET_MAKE@
+
-+SOURCES = $(libgvcompat_la_SOURCES)
-+
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -22,7 +25,6 @@
+@@ -22,7 +23,6 @@
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
-@@ -39,6 +41,52 @@
+@@ -39,6 +39,81 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = libgvcompat
-+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
++check_PROGRAMS = testjpegcontent$(EXEEXT)
++subdir = src/imageutils
++DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -33767,14 +22677,41 @@
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
-+libgvcompat_la_LIBADD =
-+am_libgvcompat_la_OBJECTS = kcpuinfo.lo
-+#>- libgvcompat_la_OBJECTS = $(am_libgvcompat_la_OBJECTS)
++libgvimageutils_la_LIBADD =
++am_libgvimageutils_la_OBJECTS = imageutils.lo jpegcontent.lo scale.lo \
++ transupp.lo asm_scale.lo jpeg-data.lo jpeg-marker.lo
++#>- libgvimageutils_la_OBJECTS = $(am_libgvimageutils_la_OBJECTS)
++#>+ 5
++libgvimageutils_la_final_OBJECTS = asm_scale.lo transupp.lo jpeg-data.lo jpeg-marker.lo libgvimageutils_la.all_cpp.lo
++libgvimageutils_la_nofinal_OBJECTS = imageutils.lo jpegcontent.lo scale.lo \
++ transupp.lo asm_scale.lo jpeg-data.lo jpeg-marker.lo
++ at KDE_USE_FINAL_FALSE@libgvimageutils_la_OBJECTS = $(libgvimageutils_la_nofinal_OBJECTS)
++ at KDE_USE_FINAL_TRUE@libgvimageutils_la_OBJECTS = $(libgvimageutils_la_final_OBJECTS)
++am_testjpegcontent_OBJECTS = testjpegcontent.$(OBJEXT)
++#>- testjpegcontent_OBJECTS = $(am_testjpegcontent_OBJECTS)
+#>+ 1
-+libgvcompat_la_OBJECTS = kcpuinfo.lo
++testjpegcontent_OBJECTS = testjpegcontent.$(OBJEXT)
++am__DEPENDENCIES_1 =
++ at libexif_internal_FALSE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
++ at libexif_internal_TRUE@am__DEPENDENCIES_2 = ../libgvexif/libgvexif.la
++testjpegcontent_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) libgvimageutils.la
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+am__depfiles_maybe = depfiles
++CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
++LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) \
++ $(CCASFLAGS)
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 2
@@ -33793,8 +22730,9 @@
+#>+ 2
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libgvcompat_la_SOURCES)
-+DIST_SOURCES = $(libgvcompat_la_SOURCES)
++SOURCES = $(libgvimageutils_la_SOURCES) $(testjpegcontent_SOURCES)
++DIST_SOURCES = $(libgvimageutils_la_SOURCES) \
++ $(testjpegcontent_SOURCES)
+HEADERS = $(noinst_HEADERS)
+ETAGS = etags
+CTAGS = ctags
@@ -33804,15 +22742,7 @@
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +159,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +198,9 @@
+@@ -164,6 +239,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -33822,7 +22752,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +257,8 @@
+@@ -222,6 +300,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -33831,100 +22761,119 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +266,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +304,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +353,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -299,84 +328,69 @@
+@@ -297,19 +378,16 @@
+ xdg_appsdir = @xdg_appsdir@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
- INCLUDES = -I$(srcdir) -I$(srcdir)/.. $(all_includes)
++ at libexif_internal_FALSE@GV_LIBEXIF_LIBS = $(LIBEXIF_LIBS)
+
+ # Do *NOT* indent the content of the ifs, this will break the generated
+ # Makefile
+ @libexif_internal_TRUE at GV_LIBEXIF_LIBS = ../libgvexif/libgvexif.la
+- at libexif_internal_FALSE@GV_LIBEXIF_LIBS = $(LIBEXIF_LIBS)
+- at libexif_internal_TRUE@GV_LIBEXIF_CFLAGS = -I$(srcdir)/../libgvexif
+ @libexif_internal_FALSE at GV_LIBEXIF_CFLAGS = $(LIBEXIF_CFLAGS)
-
- noinst_LTLIBRARIES = libgvcompat.la
++ at libexif_internal_TRUE@GV_LIBEXIF_CFLAGS = -I$(srcdir)/../libgvexif
+ AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. $(GV_LIBEXIF_CFLAGS) $(all_includes)
+ AM_CCASFLAGS = -I$(srcdir) $(GV_ASM_DEFS)
-
- libgvcompat_la_SOURCES = \
- kcpuinfo.cpp
+ noinst_LTLIBRARIES = libgvimageutils.la
+-
+ libgvimageutils_la_SOURCES = \
+ imageutils.cpp \
+ jpegcontent.cpp \
+@@ -319,7 +397,6 @@
+ jpeg-data.c \
+ jpeg-marker.c
-
noinst_HEADERS = \
- kcpuinfo.h \
- kurlcompat.h
+ orientation.h \
+ imageutils.h \
+@@ -329,123 +406,67 @@
+ transupp.h \
+ jpegerrormanager.h
-
#>- METASOURCES = AUTO
--subdir = libgvcompat
+-
+-check_PROGRAMS = testjpegcontent
+ testjpegcontent_SOURCES = testjpegcontent.cpp
+ testjpegcontent_LDADD = \
+ $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KDEPRINT) $(LIB_QT) \
+ $(LIBJPEG) $(GV_LIBEXIF_LIBS) libgvimageutils.la
+
+ testjpegcontent_LDFLAGS = $(all_libraries)
+-subdir = src/imageutils
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-
--libgvcompat_la_LDFLAGS =
--libgvcompat_la_LIBADD =
--am_libgvcompat_la_OBJECTS = kcpuinfo.lo
--#>- libgvcompat_la_OBJECTS = $(am_libgvcompat_la_OBJECTS)
+-libgvimageutils_la_LDFLAGS =
+-libgvimageutils_la_LIBADD =
+-am_libgvimageutils_la_OBJECTS = imageutils.lo jpegcontent.lo scale.lo \
+- transupp.lo asm_scale.lo jpeg-data.lo jpeg-marker.lo
+-#>- libgvimageutils_la_OBJECTS = $(am_libgvimageutils_la_OBJECTS)
+-#>+ 5
+-libgvimageutils_la_final_OBJECTS = asm_scale.lo transupp.lo jpeg-data.lo jpeg-marker.lo libgvimageutils_la.all_cpp.lo
+-libgvimageutils_la_nofinal_OBJECTS = imageutils.lo jpegcontent.lo scale.lo \
+- transupp.lo asm_scale.lo jpeg-data.lo jpeg-marker.lo
+- at KDE_USE_FINAL_FALSE@libgvimageutils_la_OBJECTS = $(libgvimageutils_la_nofinal_OBJECTS)
+- at KDE_USE_FINAL_TRUE@libgvimageutils_la_OBJECTS = $(libgvimageutils_la_final_OBJECTS)
+-check_PROGRAMS = testjpegcontent$(EXEEXT)
+-am_testjpegcontent_OBJECTS = testjpegcontent.$(OBJEXT)
+-#>- testjpegcontent_OBJECTS = $(am_testjpegcontent_OBJECTS)
-#>+ 1
--libgvcompat_la_OBJECTS = kcpuinfo.lo
+-testjpegcontent_OBJECTS = testjpegcontent.$(OBJEXT)
+- at libexif_internal_TRUE@testjpegcontent_DEPENDENCIES = \
+- at libexif_internal_TRUE@ ../libgvexif/libgvexif.la \
+- at libexif_internal_TRUE@ libgvimageutils.la
+- at libexif_internal_FALSE@testjpegcontent_DEPENDENCIES = \
+- at libexif_internal_FALSE@ libgvimageutils.la
-
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-am__depfiles_maybe = depfiles
--#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kcpuinfo.Plo
--#>+ 1
-- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kcpuinfo.Plo
+-#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/imageutils.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/jpeg-data.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/jpeg-marker.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/jpegcontent.Plo ./$(DEPDIR)/scale.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/testjpegcontent.Po \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/transupp.Plo
+-#>+ 12
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libgvimageutils_la.all_cpp.P ./$(DEPDIR)/imageutils.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/jpeg-data.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/jpeg-marker.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/jpegcontent.Plo ./$(DEPDIR)/scale.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testjpegcontent.Po \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/transupp.Plo
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/imageutils.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/jpeg-data.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/jpeg-marker.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/jpegcontent.Plo ./$(DEPDIR)/scale.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/testjpegcontent.Po \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/transupp.Plo
+-CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
+-LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) \
+- $(CCASFLAGS)
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 2
@@ -33943,18 +22892,19 @@
-#>+ 2
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(libgvcompat_la_SOURCES)
+-DIST_SOURCES = $(libgvimageutils_la_SOURCES) $(testjpegcontent_SOURCES)
-HEADERS = $(noinst_HEADERS)
-
--DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in Makefile.am
--SOURCES = $(libgvcompat_la_SOURCES)
+-DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.in \
+- Makefile.am
+-SOURCES = $(libgvimageutils_la_SOURCES) $(testjpegcontent_SOURCES)
-
#>- all: all-am
#>+ 1
all: docs-am all-am
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
+ .SUFFIXES: .S .c .cpp .lo .o .obj
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+#>- @for dep in $?; do \
@@ -33965,11 +22915,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libgvcompat/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/imageutils/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu libgvcompat/Makefile
+-#>- $(AUTOMAKE) --gnu src/imageutils/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign libgvcompat/Makefile
++#>- $(AUTOMAKE) --foreign src/imageutils/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -33979,11 +22929,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libgvcompat/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/imageutils/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu libgvcompat/Makefile
-+ $(AUTOMAKE) --foreign libgvcompat/Makefile
- cd $(top_srcdir) && perl admin/am_edit libgvcompat/Makefile.in
+- $(AUTOMAKE) --gnu src/imageutils/Makefile
++ $(AUTOMAKE) --foreign src/imageutils/Makefile
+ cd $(top_srcdir) && perl admin/am_edit src/imageutils/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -34013,8 +22963,8 @@
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-@@ -384,7 +398,7 @@
- $(CXXLINK) $(libgvcompat_la_LDFLAGS) $(libgvcompat_la_OBJECTS) $(libgvcompat_la_LIBADD) $(LIBS)
+@@ -463,7 +484,7 @@
+ $(CXXLINK) $(testjpegcontent_LDFLAGS) $(testjpegcontent_OBJECTS) $(testjpegcontent_LDADD) $(LIBS)
mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
@@ -34022,9 +22972,66 @@
distclean-compile:
-rm -f *.tab.c
-@@ -392,37 +406,25 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kcpuinfo.Plo at am__quote@
+@@ -477,79 +498,55 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/transupp.Plo at am__quote@
+ .S.o:
+- $(CCASCOMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
++ $(CCASCOMPILE) -c $<
+
+ .S.obj:
+- $(CCASCOMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++ $(CCASCOMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .S.lo:
+- $(LTCCASCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ $(LTCCASCOMPILE) -c -o $@ $<
+
+ .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@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @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@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @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@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @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 $@ $<
+
.cpp.o:
- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
@@ -34072,7 +23079,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -434,14 +436,6 @@
+@@ -561,14 +558,6 @@
-rm -f libtool
uninstall-info-am:
@@ -34087,7 +23094,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -450,6 +444,7 @@
+@@ -577,6 +566,7 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -34095,7 +23102,7 @@
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -461,10 +456,11 @@
+@@ -588,10 +578,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -34111,7 +23118,7 @@
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -487,12 +483,6 @@
+@@ -614,12 +605,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -34119,12 +23126,12 @@
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ..
+-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -506,7 +496,7 @@
+@@ -633,7 +618,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -34133,15 +23140,15 @@
else \
dir=''; \
fi; \
-@@ -524,7 +514,6 @@
- check-am: all-am
+@@ -652,7 +637,6 @@
+ $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
check: check-am
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-
installdirs:
install: install-am
install-exec: install-exec-am
-@@ -545,7 +534,7 @@
+@@ -673,7 +657,7 @@
clean-generic:
distclean-generic:
@@ -34150,7 +23157,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -570,6 +559,8 @@
+@@ -698,6 +682,8 @@
dvi-am:
@@ -34159,30 +23166,39 @@
info: info-am
info-am:
-@@ -607,28 +598,38 @@
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-noinstLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
+@@ -732,31 +718,41 @@
+
+ uninstall-am: uninstall-info-am
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-checkPROGRAMS \
+- 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 \
-+ distclean-tags distdir dvi dvi-am html html-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 \
+- install-exec-am install-info install-info-am install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
- pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am
-+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-+ pdf pdf-am ps ps-am tags uninstall uninstall-am \
-+ uninstall-info-am
++.PHONY: CTAGS GTAGS all all-am check check-am clean \
++ clean-checkPROGRAMS clean-generic clean-libtool \
++ clean-noinstLTLIBRARIES ctags 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-exec install-exec-am \
++ install-info install-info-am install-man install-strip \
++ installcheck installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++ tags uninstall uninstall-am uninstall-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
#>+ 2
--KDE_DIST=Makefile.in
-+KDE_DIST=Makefile.in Makefile.am
+-KDE_DIST=jpeg-marker.h jpeg-data.h orient6.jpg Makefile.in
++KDE_DIST=jpeg-data.h jpeg-marker.h orient6.jpg Makefile.in Makefile.am
#>+ 2
docs-am:
@@ -34191,7 +23207,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu libgvcompat/Makefile
+- $(AUTOMAKE) --gnu src/imageutils/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -34200,19 +23216,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libgvcompat/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/imageutils/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign libgvcompat/Makefile
- cd $(top_srcdir) && perl admin/am_edit libgvcompat/Makefile.in
++ $(AUTOMAKE) --foreign src/imageutils/Makefile
+ cd $(top_srcdir) && perl admin/am_edit src/imageutils/Makefile.in
-diff -Nru gwenview-1.2.0.orig/libgvexif/Makefile.in gwenview-1.2.0/libgvexif/Makefile.in
---- gwenview-1.2.0.orig/libgvexif/Makefile.in 2005-04-03 13:19:02.000000000 +0000
-+++ gwenview-1.2.0/libgvexif/Makefile.in 2005-07-26 19:28:12.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/src/libgvexif/Makefile.in gwenview-1.3.0/src/libgvexif/Makefile.in
+--- gwenview-1.3.0.orig/src/libgvexif/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/src/libgvexif/Makefile.in 2005-09-12 08:43:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -34222,29 +23238,27 @@
# 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,6 +15,9 @@
+@@ -15,6 +15,7 @@
@SET_MAKE@
+
-+SOURCES = $(libgvexif_la_SOURCES)
-+
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -22,7 +25,6 @@
+@@ -22,7 +23,6 @@
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
-@@ -39,6 +41,51 @@
+@@ -39,6 +39,49 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = libgvexif
++subdir = src/libgvexif
+DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -34259,15 +23273,13 @@
+libgvexif_la_DEPENDENCIES =
+am_libgvexif_la_OBJECTS = exif-byte-order.lo exif-content.lo \
+ exif-data.lo exif-entry.lo exif-format.lo exif-ifd.lo \
-+ exif-loader.lo exif-tag.lo exif-utils.lo jpeg-data.lo \
-+ jpeg-marker.lo
++ exif-loader.lo exif-tag.lo exif-utils.lo
+#>- libgvexif_la_OBJECTS = $(am_libgvexif_la_OBJECTS)
-+#>+ 7
-+libgvexif_la_final_OBJECTS = exif-byte-order.lo exif-content.lo exif-data.lo exif-entry.lo exif-format.lo exif-ifd.lo exif-loader.lo exif-tag.lo exif-utils.lo jpeg-data.lo jpeg-marker.lo
++#>+ 6
++libgvexif_la_final_OBJECTS = exif-byte-order.lo exif-content.lo exif-data.lo exif-entry.lo exif-format.lo exif-ifd.lo exif-loader.lo exif-tag.lo exif-utils.lo
+libgvexif_la_nofinal_OBJECTS = exif-byte-order.lo exif-content.lo \
+ exif-data.lo exif-entry.lo exif-format.lo exif-ifd.lo \
-+ exif-loader.lo exif-tag.lo exif-utils.lo jpeg-data.lo \
-+ jpeg-marker.lo
++ exif-loader.lo exif-tag.lo exif-utils.lo
+ at KDE_USE_FINAL_FALSE@libgvexif_la_OBJECTS = $(libgvexif_la_nofinal_OBJECTS)
+ at KDE_USE_FINAL_TRUE@libgvexif_la_OBJECTS = $(libgvexif_la_final_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -34292,15 +23304,7 @@
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +158,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +197,9 @@
+@@ -164,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -34310,7 +23314,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +256,8 @@
+@@ -222,6 +268,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -34319,64 +23323,15 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +265,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +303,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +321,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -299,9 +327,7 @@
+@@ -298,9 +347,7 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
INCLUDES = -I$(srcdir) -I$(srcdir)/..
@@ -34386,9 +23341,9 @@
libgvexif_la_SOURCES = \
exif-byte-order.c \
exif-content.c \
-@@ -315,9 +341,7 @@
- jpeg-data.c \
- jpeg-marker.c
+@@ -312,9 +359,7 @@
+ exif-tag.c \
+ exif-utils.c
-
libgvexif_la_LIBADD = -lm
@@ -34396,11 +23351,11 @@
noinst_HEADERS = \
exif-byte-order.h \
exif-content.h \
-@@ -333,88 +357,60 @@
+@@ -329,82 +374,60 @@
jpeg-marker.h \
i18n.h
--subdir = libgvexif
+-subdir = src/libgvexif
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -34411,15 +23366,13 @@
-libgvexif_la_DEPENDENCIES =
-am_libgvexif_la_OBJECTS = exif-byte-order.lo exif-content.lo \
- exif-data.lo exif-entry.lo exif-format.lo exif-ifd.lo \
-- exif-loader.lo exif-tag.lo exif-utils.lo jpeg-data.lo \
-- jpeg-marker.lo
+- exif-loader.lo exif-tag.lo exif-utils.lo
-#>- libgvexif_la_OBJECTS = $(am_libgvexif_la_OBJECTS)
--#>+ 7
--libgvexif_la_final_OBJECTS = exif-byte-order.lo exif-content.lo exif-data.lo exif-entry.lo exif-format.lo exif-ifd.lo exif-loader.lo exif-tag.lo exif-utils.lo jpeg-data.lo jpeg-marker.lo
+-#>+ 6
+-libgvexif_la_final_OBJECTS = exif-byte-order.lo exif-content.lo exif-data.lo exif-entry.lo exif-format.lo exif-ifd.lo exif-loader.lo exif-tag.lo exif-utils.lo
-libgvexif_la_nofinal_OBJECTS = exif-byte-order.lo exif-content.lo \
- exif-data.lo exif-entry.lo exif-format.lo exif-ifd.lo \
-- exif-loader.lo exif-tag.lo exif-utils.lo jpeg-data.lo \
-- jpeg-marker.lo
+- exif-loader.lo exif-tag.lo exif-utils.lo
- at KDE_USE_FINAL_FALSE@libgvexif_la_OBJECTS = $(libgvexif_la_nofinal_OBJECTS)
- at KDE_USE_FINAL_TRUE@libgvexif_la_OBJECTS = $(libgvexif_la_final_OBJECTS)
-
@@ -34433,10 +23386,8 @@
-#>- @AMDEP_TRUE@ ./$(DEPDIR)/exif-format.Plo \
-#>- @AMDEP_TRUE@ ./$(DEPDIR)/exif-ifd.Plo \
-#>- @AMDEP_TRUE@ ./$(DEPDIR)/exif-loader.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/exif-tag.Plo ./$(DEPDIR)/exif-utils.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/jpeg-data.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/jpeg-marker.Plo
--#>+ 10
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/exif-tag.Plo ./$(DEPDIR)/exif-utils.Plo
+-#>+ 8
- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/exif-byte-order.Plo \
- at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/exif-content.Plo \
- at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/exif-data.Plo \
@@ -34444,9 +23395,7 @@
- at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/exif-format.Plo \
- at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/exif-ifd.Plo \
- at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/exif-loader.Plo \
-- at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/exif-tag.Plo ./$(DEPDIR)/exif-utils.Plo \
-- at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/jpeg-data.Plo \
-- at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/jpeg-marker.Plo
+- at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/exif-tag.Plo ./$(DEPDIR)/exif-utils.Plo
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
@@ -34477,11 +23426,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libgvexif/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/libgvexif/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu libgvexif/Makefile
+-#>- $(AUTOMAKE) --gnu src/libgvexif/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign libgvexif/Makefile
++#>- $(AUTOMAKE) --foreign src/libgvexif/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -34491,11 +23440,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libgvexif/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/libgvexif/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu libgvexif/Makefile
-+ $(AUTOMAKE) --foreign libgvexif/Makefile
- cd $(top_srcdir) && perl admin/am_edit libgvexif/Makefile.in
+- $(AUTOMAKE) --gnu src/libgvexif/Makefile
++ $(AUTOMAKE) --foreign src/libgvexif/Makefile
+ cd $(top_srcdir) && perl admin/am_edit src/libgvexif/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -34525,7 +23474,7 @@
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-@@ -422,7 +418,7 @@
+@@ -412,7 +435,7 @@
$(LINK) $(libgvexif_la_LDFLAGS) $(libgvexif_la_OBJECTS) $(libgvexif_la_LIBADD) $(LIBS)
mostlyclean-compile:
@@ -34534,8 +23483,8 @@
distclean-compile:
-rm -f *.tab.c
-@@ -440,37 +436,25 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/jpeg-marker.Plo at am__quote@
+@@ -428,37 +451,25 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/exif-utils.Plo at am__quote@
.c.o:
- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@@ -34584,7 +23533,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -482,14 +466,6 @@
+@@ -470,14 +481,6 @@
-rm -f libtool
uninstall-info-am:
@@ -34599,7 +23548,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -498,6 +474,7 @@
+@@ -486,6 +489,7 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -34607,7 +23556,7 @@
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -509,10 +486,11 @@
+@@ -497,10 +501,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -34623,7 +23572,7 @@
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -535,12 +513,6 @@
+@@ -523,12 +528,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -34631,12 +23580,12 @@
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ..
+-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -554,7 +526,7 @@
+@@ -542,7 +541,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -34645,7 +23594,7 @@
else \
dir=''; \
fi; \
-@@ -572,7 +544,6 @@
+@@ -560,7 +559,6 @@
check-am: all-am
check: check-am
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
@@ -34653,7 +23602,7 @@
installdirs:
install: install-am
install-exec: install-exec-am
-@@ -593,7 +564,7 @@
+@@ -581,7 +579,7 @@
clean-generic:
distclean-generic:
@@ -34662,7 +23611,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -618,6 +589,8 @@
+@@ -606,6 +604,8 @@
dvi-am:
@@ -34671,7 +23620,7 @@
info: info-am
info-am:
-@@ -655,28 +628,38 @@
+@@ -643,28 +643,38 @@
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libtool clean-noinstLTLIBRARIES ctags distclean \
distclean-compile distclean-generic distclean-libtool \
@@ -34693,7 +23642,7 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=Makefile.in tags
+-KDE_DIST=Makefile.in
+KDE_DIST=Makefile.in Makefile.am
#>+ 2
@@ -34703,7 +23652,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu libgvexif/Makefile
+- $(AUTOMAKE) --gnu src/libgvexif/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -34712,19 +23661,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libgvexif/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/libgvexif/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign libgvexif/Makefile
- cd $(top_srcdir) && perl admin/am_edit libgvexif/Makefile.in
++ $(AUTOMAKE) --foreign src/libgvexif/Makefile
+ cd $(top_srcdir) && perl admin/am_edit src/libgvexif/Makefile.in
-diff -Nru gwenview-1.2.0.orig/Makefile.in gwenview-1.2.0/Makefile.in
---- gwenview-1.2.0.orig/Makefile.in 2005-04-03 13:19:13.000000000 +0000
-+++ gwenview-1.2.0/Makefile.in 2005-07-26 19:28:12.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/src/Makefile.in gwenview-1.3.0/src/Makefile.in
+--- gwenview-1.3.0.orig/src/Makefile.in 2005-09-11 10:40:29.000000000 -0400
++++ gwenview-1.3.0/src/Makefile.in 2005-09-12 08:43:46.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -34745,31 +23694,24 @@
@@ -22,7 +21,6 @@
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
-@@ -39,6 +37,54 @@
+@@ -39,6 +37,38 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-+ $(srcdir)/Makefile.in $(srcdir)/admin/deps.am \
-+ $(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \
-+ ChangeLog INSTALL NEWS TODO admin/compile admin/config.guess \
-+ admin/config.sub admin/depcomp admin/install-sh \
-+ admin/ltmain.sh admin/missing admin/mkinstalldirs admin/ylwrap
-+subdir = .
++subdir = src
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in NEWS
+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)
-+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-+ configure.lineno configure.status.lineno
+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = config.h
++CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
@@ -34788,32 +23730,15 @@
+ uninstall-recursive nmcheck-recursive bcheck-recursive
+ETAGS = etags
+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
++DIST_SUBDIRS = tsthread libgvexif imageutils gvcore pics desktopfiles \
++ doc tools gvimagepart gvdirpart app
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+distdir = $(PACKAGE)-$(VERSION)
-+top_distdir = $(distdir)
-+am__remove_distdir = \
-+ { test ! -d $(distdir) \
-+ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-+ && rm -fr $(distdir); }; }
-+DIST_ARCHIVES = $(distdir).tar.gz
-+GZIP_ENV = --best
-+distuninstallcheck_listfiles = find . -type f -print
-+distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +157,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +196,9 @@
+@@ -164,6 +194,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -34823,7 +23748,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +255,8 @@
+@@ -222,6 +255,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -34832,74 +23757,26 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +264,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +302,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +308,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -299,63 +326,64 @@
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
- AUTOMAKE_OPTIONS = foreign 1.5
+@@ -301,45 +337,55 @@
+ # Do *NOT* indent the content of the ifs, this will break the generated
+ # Makefile
+ @libexif_internal_TRUE at LIBGVEXIFDIR = libgvexif
-
+ SUBDIRS = tsthread $(LIBGVEXIFDIR) imageutils gvcore pics desktopfiles doc tools gvimagepart gvdirpart app
+-
EXTRA_DIST = AUTHORS ChangeLog COPYING INSTALL NEWS README TODO CREDITS
- SUBDIRS = tsthread libgvexif libgvcompat gvimageutils src pics desktopfiles doc tools gvimagepart gvdirpart gwenviewapp po
--subdir = .
+-subdir = src
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = config.h
+-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-
@@ -34914,99 +23791,66 @@
- all-recursive install-data-recursive install-exec-recursive \
- installdirs-recursive install-recursive uninstall-recursive \
- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/admin/deps.am \
-- $(srcdir)/configure AUTHORS COPYING ChangeLog INSTALL \
-- Makefile.am NEWS TODO acinclude.m4 aclocal.m4 admin/compile \
-- admin/config.guess admin/config.sub admin/depcomp \
-- admin/install-sh admin/ltmain.sh admin/missing \
-- admin/mkinstalldirs admin/ylwrap config.h.in configure \
-- configure.in
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: config.h
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am NEWS
+-DIST_SUBDIRS = tsthread libgvexif imageutils gvcore pics desktopfiles \
+- doc tools gvimagepart gvdirpart app
+ #>- all: all-recursive
#>+ 1
- all: docs-am config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
+ all: docs-am all-recursive
.SUFFIXES:
--
--am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-- configure.lineno
--$(srcdir)/Makefile.in: Makefile.am $(srcdir)/admin/deps.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+am--refresh:
-+ @:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+#>- @for dep in $?; do \
+#>- case '$(am__configure_deps)' in \
+#>- *$$dep*) \
-+#>- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-+#>- cd $(srcdir) && $(AUTOMAKE) --foreign \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+#>- && exit 0; \
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
#>- cd $(top_srcdir) && \
- #>- $(AUTOMAKE) --foreign Makefile
+-#>- $(AUTOMAKE) --gnu src/Makefile
-#>+ 3
-+#>+ 14
++#>- $(AUTOMAKE) --foreign src/Makefile
++#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-+ ( \
-+ cd $(srcdir) && $(AUTOMAKE) --foreign \
-+ ) || exit 1; echo ' cd $(top_srcdir) && perl admin/am_edit '; cd $(top_srcdir) && perl admin/am_edit && exit 0; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign Makefile
- cd $(top_srcdir) && perl admin/am_edit Makefile.in
+- $(AUTOMAKE) --gnu src/Makefile
++ $(AUTOMAKE) --foreign src/Makefile
+ cd $(top_srcdir) && perl admin/am_edit src/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
-+ echo ' $(SHELL) ./config.status'; \
-+ $(SHELL) ./config.status;; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
++ 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: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
--$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- #>- cd $(srcdir) && $(AUTOCONF)
- #>+ 2
- cd $(srcdir) && rm -f configure
- cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure
--
--$(ACLOCAL_M4): configure.in acinclude.m4
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- config.h: stamp-h1
-@@ -367,10 +395,10 @@
- stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
- @rm -f stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status config.h
--
--$(srcdir)/config.h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_srcdir) && $(AUTOHEADER)
-- touch $(srcdir)/config.h.in
-+ rm -f stamp-h1
-+ touch $@
-
- distclean-hdr:
- -rm -f config.h stamp-h1
-@@ -392,7 +420,13 @@
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -358,7 +404,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):
@@ -35021,7 +23865,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -404,7 +438,7 @@
+@@ -370,7 +422,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -35030,7 +23874,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -412,7 +446,13 @@
+@@ -378,7 +430,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -35045,7 +23889,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -433,7 +473,7 @@
+@@ -399,7 +457,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -35054,7 +23898,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,14 +484,6 @@
+@@ -410,14 +468,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -35069,13 +23913,13 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -460,19 +492,22 @@
+@@ -426,19 +476,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
+tags: TAGS
- TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
@@ -35094,7 +23938,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -482,10 +517,11 @@
+@@ -448,10 +501,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -35108,9 +23952,9 @@
+ $$tags $$unique; \
+ fi
ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -508,26 +544,11 @@
+@@ -474,12 +528,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -35118,27 +23962,12 @@
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = .
--distdir = $(PACKAGE)-$(VERSION)
--
--am__remove_distdir = \
-- { test ! -d $(distdir) \
-- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-- && rm -fr $(distdir); }; }
--
--GZIP_ENV = --best
--distuninstallcheck_listfiles = find . -type f -print
--distcleancheck_listfiles = find . -type f -print
+-top_distdir = ..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- $(am__remove_distdir)
- mkdir $(distdir)
-- $(mkinstalldirs) $(distdir)/./admin $(distdir)/admin
-+ $(mkdir_p) $(distdir)/admin
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
-@@ -539,7 +560,7 @@
+@@ -493,7 +541,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -35147,12 +23976,9 @@
else \
dir=''; \
fi; \
-@@ -554,15 +575,17 @@
- || exit 1; \
- fi; \
+@@ -510,13 +558,15 @@
done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_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 \
@@ -35170,92 +23996,15 @@
distdir) \
|| exit 1; \
fi; \
-@@ -573,19 +596,46 @@
- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
- || chmod -R a+r $(distdir)
- dist-gzip: distdir
-- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+ $(am__remove_distdir)
-+
-+dist-bzip2: distdir
-+ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-+ $(am__remove_distdir)
-+
-+dist-tarZ: distdir
-+ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-+ $(am__remove_distdir)
-+
-+dist-shar: distdir
-+ shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-+ $(am__remove_distdir)
-+
-+dist-zip: distdir
-+ -rm -f $(distdir).zip
-+ zip -rq $(distdir).zip $(distdir)
- $(am__remove_distdir)
-
- dist dist-all: distdir
-- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
-
- # This target untars the dist file and tries a VPATH configuration. Then
- # it guarantees that the distribution is self-contained by making another
- # tarfile.
- distcheck: dist
-- $(am__remove_distdir)
-- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
-+ case '$(DIST_ARCHIVES)' in \
-+ *.tar.gz*) \
-+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-+ *.tar.bz2*) \
-+ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-+ *.tar.Z*) \
-+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-+ *.shar.gz*) \
-+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-+ *.zip*) \
-+ unzip $(distdir).zip ;;\
-+ esac
- chmod -R a-w $(distdir); chmod a+w $(distdir)
- mkdir $(distdir)/_build
- mkdir $(distdir)/_inst
-@@ -605,19 +655,20 @@
- distuninstallcheck \
- && chmod -R a-w "$$dc_install_base" \
- && ({ \
-- (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
-+ (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
- distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
- } || { rm -rf "$$dc_destdir"; exit 1; }) \
- && rm -rf "$$dc_destdir" \
-- && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
-- && rm -f $(distdir).tar.gz \
-+ && $(MAKE) $(AM_MAKEFLAGS) dist \
-+ && rm -rf $(DIST_ARCHIVES) \
- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
- $(am__remove_distdir)
-- @echo "$(distdir).tar.gz is ready for distribution" | \
-- sed 'h;s/./=/g;p;x;p;x'
-+ @(echo "$(distdir) archives ready for distribution: "; \
-+ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-+ sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
- distuninstallcheck:
- @cd $(distuninstallcheck_dir) \
- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-@@ -641,7 +692,6 @@
- all-am: Makefile config.h
+@@ -526,7 +576,6 @@
+ all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
-
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -661,7 +711,7 @@
+@@ -546,7 +595,7 @@
clean-generic:
distclean-generic:
@@ -35264,17 +24013,8 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -677,13 +727,15 @@
- distclean: distclean-recursive
- -rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \
-- distclean-tags
-+distclean-am: clean-am distclean-generic distclean-hdr \
-+ distclean-libtool distclean-tags
+@@ -568,6 +617,8 @@
- dvi: dvi-recursive
-
dvi-am:
+html: html-recursive
@@ -35282,69 +24022,76 @@
info: info-recursive
info-am:
-@@ -720,23 +772,20 @@
+@@ -602,22 +653,18 @@
uninstall-info: uninstall-info-recursive
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
- clean-generic clean-libtool clean-recursive ctags \
-- ctags-recursive dist dist-all dist-gzip distcheck distclean \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-+ check-am clean clean-generic clean-libtool clean-recursive \
-+ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-+ dist-shar dist-tarZ dist-zip distcheck distclean \
- distclean-generic distclean-hdr distclean-libtool \
- distclean-recursive distclean-tags distcleancheck distdir \
-- distuninstallcheck dvi dvi-am dvi-recursive info info-am \
-- info-recursive install install-am install-data install-data-am \
-- install-data-recursive install-exec install-exec-am \
-- install-exec-recursive install-info install-info-am \
-- install-info-recursive install-man install-recursive \
-+ distuninstallcheck dvi dvi-am html html-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 \
-- 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 \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
-+ installdirs-am maintainer-clean maintainer-clean-generic \
-+ maintainer-clean-recursive mostlyclean mostlyclean-generic \
-+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-+ tags tags-recursive uninstall uninstall-am uninstall-info-am
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
- $(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in $(top_srcdir)/admin/cvs.sh $(top_srcdir)/admin/pkg.m4.in
- @cd $(top_srcdir) && $(SHELL) admin/cvs.sh acinclude_m4
-@@ -766,15 +815,16 @@
+
+ messages: rc.cpp
+@@ -629,15 +676,24 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=stamp-h.in subdirs Makefile.in configure.files Makefile.cvs HACKING configure.in.in
-+KDE_DIST=stamp-h.in subdirs Makefile.in configure.files config.h.in configure.in Makefile.cvs HACKING aclocal.m4 configure.in.in Makefile.am configure acinclude.m4
+-KDE_DIST=Makefile.in HACKING configure.in.in
++KDE_DIST=Makefile.in HACKING configure.in.in Makefile.am
#>+ 2
docs-am:
-#>+ 6
-+#>+ 7
++#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --foreign Makefile
-+ \
-+ cd $(srcdir) && $(AUTOMAKE) --foreign \
-+
- cd $(top_srcdir) && perl admin/am_edit Makefile.in
+- $(AUTOMAKE) --gnu src/Makefile
++ @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) --foreign src/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign src/Makefile
+ cd $(top_srcdir) && perl admin/am_edit src/Makefile.in
-diff -Nru gwenview-1.2.0.orig/pics/action/Makefile.in gwenview-1.2.0/pics/action/Makefile.in
---- gwenview-1.2.0.orig/pics/action/Makefile.in 2005-04-03 13:19:02.000000000 +0000
-+++ gwenview-1.2.0/pics/action/Makefile.in 2005-07-26 19:28:12.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/src/pics/action/Makefile.in gwenview-1.3.0/src/pics/action/Makefile.in
+--- gwenview-1.3.0.orig/src/pics/action/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/src/pics/action/Makefile.in 2005-09-12 08:43:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -35365,7 +24112,7 @@
@@ -22,7 +21,6 @@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
+ top_builddir = ../../..
-
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
@@ -35374,7 +24121,7 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = pics/action
++subdir = src/pics/action
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -35392,15 +24139,7 @@
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +124,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +163,9 @@
+@@ -164,6 +177,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -35410,7 +24149,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +222,8 @@
+@@ -222,6 +238,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -35419,68 +24158,19 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +231,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +269,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +291,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -300,27 +294,53 @@
+@@ -299,27 +318,53 @@
xdg_menudir = @xdg_menudir@
icondir = $(kde_datadir)/gwenview/icons
icon_ICON = AUTO
--subdir = pics/action
+-subdir = src/pics/action
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -35502,11 +24192,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pics/action/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/action/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu pics/action/Makefile
+-#>- $(AUTOMAKE) --gnu src/pics/action/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign pics/action/Makefile
++#>- $(AUTOMAKE) --foreign src/pics/action/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -35516,11 +24206,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pics/action/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/action/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu pics/action/Makefile
-+ $(AUTOMAKE) --foreign pics/action/Makefile
- cd $(top_srcdir) && perl admin/am_edit pics/action/Makefile.in
+- $(AUTOMAKE) --gnu src/pics/action/Makefile
++ $(AUTOMAKE) --foreign src/pics/action/Makefile
+ cd $(top_srcdir) && perl admin/am_edit src/pics/action/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -35543,7 +24233,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -337,12 +357,6 @@
+@@ -336,12 +381,6 @@
ctags: CTAGS
CTAGS:
@@ -35551,12 +24241,12 @@
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -356,7 +370,7 @@
+@@ -355,7 +394,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -35565,7 +24255,7 @@
else \
dir=''; \
fi; \
-@@ -374,7 +388,6 @@
+@@ -373,7 +412,6 @@
check-am: all-am
check: check-am
all-am: Makefile
@@ -35573,7 +24263,7 @@
installdirs:
install: install-am
install-exec: install-exec-am
-@@ -395,7 +408,7 @@
+@@ -394,7 +432,7 @@
clean-generic:
distclean-generic:
@@ -35582,7 +24272,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -416,6 +429,8 @@
+@@ -415,6 +453,8 @@
dvi-am:
@@ -35591,7 +24281,7 @@
info: info-am
info-am:
-@@ -454,10 +469,10 @@
+@@ -453,10 +493,10 @@
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
@@ -35606,163 +24296,130 @@
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
uninstall-info-am
-@@ -467,14 +482,28 @@
+@@ -466,83 +506,92 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=hi48-action-rotate_right.png hi32-action-gvprevious.png hi16-action-flip.png hi16-action-rotate_left.png hi22-action-medthumbnails.png hi16-action-dnd4.png hi32-action-smallthumbnails.png hi22-action-flip.png imageops.svgz hi22-action-gvnext.png hi16-action-dnd7.png hi48-action-rotate_left.png imageops.svg hi32-action-slideshow.png hi32-action-mirror.png hi16-action-dnd3.png hi22-action-gvfirst.png hi48-action-mirror.png hi32-action-gvfirst.png hi22-action-rotate_left.png hi32-action-gvlast.png slideshow.svg hi48-action-flip.png hi22-action-smallthumbnails.png hi22-action-mirror.png hi32-action-medthumbnails.png hi32-action-flip.png Makefile.in hi48-action-slideshow.png hi32-action-largethumbnails.png hi16-action-dnd5.png hi22-action-gvlast.png hi22-action-rotate_right.png hi32-action-rotate_right.png hi16-action-mirror.png hi32-action-rotate_left.png slideshow.svgz hi22-action-gvprevious.png hi22-action-slideshow.png hi16-action-dnd1.png hi16-action-dnd6.png hi32-action-gvnext.png hi16-action-dnd2.png hi16-action-rotate_right.png hi16-action-slideshow.png hi22-action-largethumbnails.png hi16-action-dnd8.png
-+KDE_DIST=hi48-action-rotate_right.png hi32-action-gvprevious.png hi16-action-flip.png hi16-action-rotate_left.png hi16-action-dnd4.png hi22-action-medthumbnails.png hi32-action-smallthumbnails.png hi22-action-flip.png imageops.svgz hi22-action-gvnext.png hi16-action-dnd7.png hi48-action-rotate_left.png imageops.svg hi32-action-slideshow.png hi32-action-mirror.png hi16-action-dnd3.png hi22-action-gvfirst.png hi48-action-mirror.png hi32-action-gvfirst.png hi22-action-rotate_left.png hi32-action-gvlast.png slideshow.svg hi22-action-smallthumbnails.png hi48-action-flip.png hi22-action-mirror.png hi32-action-medthumbnails.png hi32-action-flip.png Makefile.in hi22-action-gvlast.png hi32-action-largethumbnails.png hi48-action-slideshow.png hi16-action-dnd5.png hi22-action-rotate_right.png hi32-action-rotate_right.png hi16-action-mirror.png hi32-action-rotate_left.png hi22-action-slideshow.png slideshow.svgz hi22-action-gvprevious.png hi16-action-dnd1.png hi16-action-dnd6.png hi32-action-gvnext.png hi16-action-rotate_right.png hi16-action-dnd2.png hi16-action-slideshow.png hi22-action-largethumbnails.png Makefile.am hi16-action-dnd8.png
+-KDE_DIST=imageops.svgz hi48-action-rotate_left.png imageops.svg hi32-action-mirror.png hi32-action-slideshow.png slideshow.svg hi48-action-flip.png hi48-action-slideshow.png hi22-action-rotate_right.png hi32-action-rotate_right.png hisc-action-slideshow.svgz hi16-action-dnd6.png hi16-action-dnd2.png hi16-action-rotate_right.png hi16-action-dnd8.png hi48-action-rotate_right.png hi16-action-flip.png hi16-action-rotate_left.png hi16-action-dnd4.png hi22-action-flip.png hi16-action-dnd7.png hi16-action-dnd3.png hi22-action-rotate_left.png hi48-action-mirror.png hi22-action-mirror.png hi32-action-flip.png Makefile.in hi16-action-dnd5.png hi16-action-mirror.png hi32-action-rotate_left.png hi22-action-slideshow.png hi16-action-dnd1.png hi16-action-slideshow.png
++KDE_DIST=imageops.svgz hi48-action-rotate_left.png imageops.svg hi32-action-slideshow.png hi32-action-mirror.png slideshow.svg hi48-action-flip.png hi48-action-slideshow.png hi22-action-rotate_right.png hi32-action-rotate_right.png hisc-action-slideshow.svgz hi16-action-dnd6.png hi16-action-dnd2.png hi16-action-rotate_right.png hi16-action-dnd8.png hi48-action-rotate_right.png hi16-action-flip.png hi16-action-rotate_left.png hi16-action-dnd4.png hi22-action-flip.png hi16-action-dnd7.png hi16-action-dnd3.png hi48-action-mirror.png hi22-action-rotate_left.png hi22-action-mirror.png hi32-action-flip.png Makefile.in hi16-action-dnd5.png hi16-action-mirror.png hi32-action-rotate_left.png hi22-action-slideshow.png hi16-action-dnd1.png hi16-action-slideshow.png Makefile.am
#>+ 2
docs-am:
- #>+ 92
+ #>+ 67
install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(icondir)/hicolor/48x48/actions
+- $(INSTALL_DATA) $(srcdir)/hi48-action-rotate_left.png $(DESTDIR)$(icondir)/hicolor/48x48/actions/rotate_left.png
+- $(INSTALL_DATA) $(srcdir)/hi48-action-mirror.png $(DESTDIR)$(icondir)/hicolor/48x48/actions/mirror.png
+- $(mkinstalldirs) $(DESTDIR)$(icondir)/hicolor/scalable/actions
+- $(INSTALL_DATA) $(srcdir)/hisc-action-slideshow.svgz $(DESTDIR)$(icondir)/hicolor/scalable/actions/slideshow.svgz
+ $(mkinstalldirs) $(DESTDIR)$(icondir)/hicolor/22x22/actions
+ $(INSTALL_DATA) $(srcdir)/hi22-action-rotate_left.png $(DESTDIR)$(icondir)/hicolor/22x22/actions/rotate_left.png
-+ $(mkinstalldirs) $(DESTDIR)$(icondir)/hicolor/32x32/actions
-+ $(INSTALL_DATA) $(srcdir)/hi32-action-gvfirst.png $(DESTDIR)$(icondir)/hicolor/32x32/actions/gvfirst.png
-+ $(INSTALL_DATA) $(srcdir)/hi32-action-largethumbnails.png $(DESTDIR)$(icondir)/hicolor/32x32/actions/largethumbnails.png
+ $(mkinstalldirs) $(DESTDIR)$(icondir)/hicolor/32x32/actions
+- $(INSTALL_DATA) $(srcdir)/hi32-action-flip.png $(DESTDIR)$(icondir)/hicolor/32x32/actions/flip.png
+- $(INSTALL_DATA) $(srcdir)/hi32-action-rotate_right.png $(DESTDIR)$(icondir)/hicolor/32x32/actions/rotate_right.png
+ $(INSTALL_DATA) $(srcdir)/hi32-action-rotate_left.png $(DESTDIR)$(icondir)/hicolor/32x32/actions/rotate_left.png
+ $(INSTALL_DATA) $(srcdir)/hi22-action-rotate_right.png $(DESTDIR)$(icondir)/hicolor/22x22/actions/rotate_right.png
-+ $(INSTALL_DATA) $(srcdir)/hi32-action-medthumbnails.png $(DESTDIR)$(icondir)/hicolor/32x32/actions/medthumbnails.png
+ $(mkinstalldirs) $(DESTDIR)$(icondir)/hicolor/48x48/actions
+ $(INSTALL_DATA) $(srcdir)/hi48-action-flip.png $(DESTDIR)$(icondir)/hicolor/48x48/actions/flip.png
+ $(INSTALL_DATA) $(srcdir)/hi48-action-slideshow.png $(DESTDIR)$(icondir)/hicolor/48x48/actions/slideshow.png
$(mkinstalldirs) $(DESTDIR)$(icondir)/hicolor/16x16/actions
-+ $(INSTALL_DATA) $(srcdir)/hi16-action-slideshow.png $(DESTDIR)$(icondir)/hicolor/16x16/actions/slideshow.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-flip.png $(DESTDIR)$(icondir)/hicolor/16x16/actions/flip.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-rotate_right.png $(DESTDIR)$(icondir)/hicolor/16x16/actions/rotate_right.png
+- $(mkinstalldirs) $(DESTDIR)$(icondir)/hicolor/22x22/actions
+- $(INSTALL_DATA) $(srcdir)/hi22-action-slideshow.png $(DESTDIR)$(icondir)/hicolor/22x22/actions/slideshow.png
+- $(INSTALL_DATA) $(srcdir)/hi32-action-slideshow.png $(DESTDIR)$(icondir)/hicolor/32x32/actions/slideshow.png
+ $(INSTALL_DATA) $(srcdir)/hi16-action-slideshow.png $(DESTDIR)$(icondir)/hicolor/16x16/actions/slideshow.png
+- $(INSTALL_DATA) $(srcdir)/hi48-action-slideshow.png $(DESTDIR)$(icondir)/hicolor/48x48/actions/slideshow.png
+- $(INSTALL_DATA) $(srcdir)/hi32-action-mirror.png $(DESTDIR)$(icondir)/hicolor/32x32/actions/mirror.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-mirror.png $(DESTDIR)$(icondir)/hicolor/16x16/actions/mirror.png
+ $(INSTALL_DATA) $(srcdir)/hi16-action-rotate_right.png $(DESTDIR)$(icondir)/hicolor/16x16/actions/rotate_right.png
-+ $(INSTALL_DATA) $(srcdir)/hi22-action-medthumbnails.png $(DESTDIR)$(icondir)/hicolor/22x22/actions/medthumbnails.png
$(INSTALL_DATA) $(srcdir)/hi16-action-dnd1.png $(DESTDIR)$(icondir)/hicolor/16x16/actions/dnd1.png
$(INSTALL_DATA) $(srcdir)/hi16-action-dnd2.png $(DESTDIR)$(icondir)/hicolor/16x16/actions/dnd2.png
+- $(INSTALL_DATA) $(srcdir)/hi22-action-flip.png $(DESTDIR)$(icondir)/hicolor/22x22/actions/flip.png
+- $(INSTALL_DATA) $(srcdir)/hi22-action-rotate_right.png $(DESTDIR)$(icondir)/hicolor/22x22/actions/rotate_right.png
$(INSTALL_DATA) $(srcdir)/hi16-action-dnd3.png $(DESTDIR)$(icondir)/hicolor/16x16/actions/dnd3.png
-@@ -484,44 +513,41 @@
+ $(INSTALL_DATA) $(srcdir)/hi16-action-dnd4.png $(DESTDIR)$(icondir)/hicolor/16x16/actions/dnd4.png
+ $(INSTALL_DATA) $(srcdir)/hi16-action-dnd5.png $(DESTDIR)$(icondir)/hicolor/16x16/actions/dnd5.png
+ $(INSTALL_DATA) $(srcdir)/hi16-action-dnd6.png $(DESTDIR)$(icondir)/hicolor/16x16/actions/dnd6.png
$(INSTALL_DATA) $(srcdir)/hi16-action-dnd7.png $(DESTDIR)$(icondir)/hicolor/16x16/actions/dnd7.png
$(INSTALL_DATA) $(srcdir)/hi16-action-dnd8.png $(DESTDIR)$(icondir)/hicolor/16x16/actions/dnd8.png
- $(INSTALL_DATA) $(srcdir)/hi16-action-flip.png $(DESTDIR)$(icondir)/hicolor/16x16/actions/flip.png
-+ $(INSTALL_DATA) $(srcdir)/hi22-action-largethumbnails.png $(DESTDIR)$(icondir)/hicolor/22x22/actions/largethumbnails.png
-+ $(INSTALL_DATA) $(srcdir)/hi22-action-gvnext.png $(DESTDIR)$(icondir)/hicolor/22x22/actions/gvnext.png
- $(INSTALL_DATA) $(srcdir)/hi16-action-mirror.png $(DESTDIR)$(icondir)/hicolor/16x16/actions/mirror.png
-- $(INSTALL_DATA) $(srcdir)/hi16-action-rotate_left.png $(DESTDIR)$(icondir)/hicolor/16x16/actions/rotate_left.png
-- $(INSTALL_DATA) $(srcdir)/hi16-action-rotate_right.png $(DESTDIR)$(icondir)/hicolor/16x16/actions/rotate_right.png
-- $(INSTALL_DATA) $(srcdir)/hi16-action-slideshow.png $(DESTDIR)$(icondir)/hicolor/16x16/actions/slideshow.png
-- $(mkinstalldirs) $(DESTDIR)$(icondir)/hicolor/22x22/actions
-+ $(INSTALL_DATA) $(srcdir)/hi32-action-gvprevious.png $(DESTDIR)$(icondir)/hicolor/32x32/actions/gvprevious.png
- $(INSTALL_DATA) $(srcdir)/hi22-action-flip.png $(DESTDIR)$(icondir)/hicolor/22x22/actions/flip.png
-- $(INSTALL_DATA) $(srcdir)/hi22-action-gvfirst.png $(DESTDIR)$(icondir)/hicolor/22x22/actions/gvfirst.png
-- $(INSTALL_DATA) $(srcdir)/hi22-action-gvlast.png $(DESTDIR)$(icondir)/hicolor/22x22/actions/gvlast.png
-- $(INSTALL_DATA) $(srcdir)/hi22-action-gvnext.png $(DESTDIR)$(icondir)/hicolor/22x22/actions/gvnext.png
-- $(INSTALL_DATA) $(srcdir)/hi22-action-gvprevious.png $(DESTDIR)$(icondir)/hicolor/22x22/actions/gvprevious.png
-- $(INSTALL_DATA) $(srcdir)/hi22-action-largethumbnails.png $(DESTDIR)$(icondir)/hicolor/22x22/actions/largethumbnails.png
-- $(INSTALL_DATA) $(srcdir)/hi22-action-medthumbnails.png $(DESTDIR)$(icondir)/hicolor/22x22/actions/medthumbnails.png
-- $(INSTALL_DATA) $(srcdir)/hi22-action-mirror.png $(DESTDIR)$(icondir)/hicolor/22x22/actions/mirror.png
+- $(INSTALL_DATA) $(srcdir)/hi48-action-flip.png $(DESTDIR)$(icondir)/hicolor/48x48/actions/flip.png
+- $(INSTALL_DATA) $(srcdir)/hi48-action-rotate_right.png $(DESTDIR)$(icondir)/hicolor/48x48/actions/rotate_right.png
- $(INSTALL_DATA) $(srcdir)/hi22-action-rotate_left.png $(DESTDIR)$(icondir)/hicolor/22x22/actions/rotate_left.png
-- $(INSTALL_DATA) $(srcdir)/hi22-action-rotate_right.png $(DESTDIR)$(icondir)/hicolor/22x22/actions/rotate_right.png
-- $(INSTALL_DATA) $(srcdir)/hi22-action-slideshow.png $(DESTDIR)$(icondir)/hicolor/22x22/actions/slideshow.png
-- $(INSTALL_DATA) $(srcdir)/hi22-action-smallthumbnails.png $(DESTDIR)$(icondir)/hicolor/22x22/actions/smallthumbnails.png
-- $(mkinstalldirs) $(DESTDIR)$(icondir)/hicolor/32x32/actions
-- $(INSTALL_DATA) $(srcdir)/hi32-action-flip.png $(DESTDIR)$(icondir)/hicolor/32x32/actions/flip.png
-- $(INSTALL_DATA) $(srcdir)/hi32-action-gvfirst.png $(DESTDIR)$(icondir)/hicolor/32x32/actions/gvfirst.png
-- $(INSTALL_DATA) $(srcdir)/hi32-action-gvlast.png $(DESTDIR)$(icondir)/hicolor/32x32/actions/gvlast.png
- $(INSTALL_DATA) $(srcdir)/hi32-action-gvnext.png $(DESTDIR)$(icondir)/hicolor/32x32/actions/gvnext.png
-- $(INSTALL_DATA) $(srcdir)/hi32-action-gvprevious.png $(DESTDIR)$(icondir)/hicolor/32x32/actions/gvprevious.png
-- $(INSTALL_DATA) $(srcdir)/hi32-action-largethumbnails.png $(DESTDIR)$(icondir)/hicolor/32x32/actions/largethumbnails.png
-- $(INSTALL_DATA) $(srcdir)/hi32-action-medthumbnails.png $(DESTDIR)$(icondir)/hicolor/32x32/actions/medthumbnails.png
-- $(INSTALL_DATA) $(srcdir)/hi32-action-mirror.png $(DESTDIR)$(icondir)/hicolor/32x32/actions/mirror.png
- $(INSTALL_DATA) $(srcdir)/hi32-action-rotate_left.png $(DESTDIR)$(icondir)/hicolor/32x32/actions/rotate_left.png
-+ $(INSTALL_DATA) $(srcdir)/hi22-action-gvprevious.png $(DESTDIR)$(icondir)/hicolor/22x22/actions/gvprevious.png
-+ $(INSTALL_DATA) $(srcdir)/hi16-action-rotate_left.png $(DESTDIR)$(icondir)/hicolor/16x16/actions/rotate_left.png
-+ $(INSTALL_DATA) $(srcdir)/hi22-action-gvlast.png $(DESTDIR)$(icondir)/hicolor/22x22/actions/gvlast.png
-+ $(INSTALL_DATA) $(srcdir)/hi22-action-gvfirst.png $(DESTDIR)$(icondir)/hicolor/22x22/actions/gvfirst.png
- $(INSTALL_DATA) $(srcdir)/hi32-action-rotate_right.png $(DESTDIR)$(icondir)/hicolor/32x32/actions/rotate_right.png
-- $(INSTALL_DATA) $(srcdir)/hi32-action-slideshow.png $(DESTDIR)$(icondir)/hicolor/32x32/actions/slideshow.png
- $(INSTALL_DATA) $(srcdir)/hi32-action-smallthumbnails.png $(DESTDIR)$(icondir)/hicolor/32x32/actions/smallthumbnails.png
-- $(mkinstalldirs) $(DESTDIR)$(icondir)/hicolor/48x48/actions
-- $(INSTALL_DATA) $(srcdir)/hi48-action-flip.png $(DESTDIR)$(icondir)/hicolor/48x48/actions/flip.png
+- $(INSTALL_DATA) $(srcdir)/hi22-action-mirror.png $(DESTDIR)$(icondir)/hicolor/22x22/actions/mirror.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-flip.png $(DESTDIR)$(icondir)/hicolor/16x16/actions/flip.png
++ $(mkinstalldirs) $(DESTDIR)$(icondir)/hicolor/scalable/actions
++ $(INSTALL_DATA) $(srcdir)/hisc-action-slideshow.svgz $(DESTDIR)$(icondir)/hicolor/scalable/actions/slideshow.svgz
++ $(INSTALL_DATA) $(srcdir)/hi16-action-mirror.png $(DESTDIR)$(icondir)/hicolor/16x16/actions/mirror.png
++ $(INSTALL_DATA) $(srcdir)/hi22-action-flip.png $(DESTDIR)$(icondir)/hicolor/22x22/actions/flip.png
+ $(INSTALL_DATA) $(srcdir)/hi16-action-rotate_left.png $(DESTDIR)$(icondir)/hicolor/16x16/actions/rotate_left.png
++ $(INSTALL_DATA) $(srcdir)/hi32-action-rotate_right.png $(DESTDIR)$(icondir)/hicolor/32x32/actions/rotate_right.png
+ $(INSTALL_DATA) $(srcdir)/hi22-action-mirror.png $(DESTDIR)$(icondir)/hicolor/22x22/actions/mirror.png
-+ $(INSTALL_DATA) $(srcdir)/hi32-action-gvlast.png $(DESTDIR)$(icondir)/hicolor/32x32/actions/gvlast.png
- $(INSTALL_DATA) $(srcdir)/hi48-action-mirror.png $(DESTDIR)$(icondir)/hicolor/48x48/actions/mirror.png
- $(INSTALL_DATA) $(srcdir)/hi48-action-rotate_left.png $(DESTDIR)$(icondir)/hicolor/48x48/actions/rotate_left.png
++ $(INSTALL_DATA) $(srcdir)/hi48-action-mirror.png $(DESTDIR)$(icondir)/hicolor/48x48/actions/mirror.png
++ $(INSTALL_DATA) $(srcdir)/hi48-action-rotate_left.png $(DESTDIR)$(icondir)/hicolor/48x48/actions/rotate_left.png
+ $(INSTALL_DATA) $(srcdir)/hi32-action-mirror.png $(DESTDIR)$(icondir)/hicolor/32x32/actions/mirror.png
+ $(INSTALL_DATA) $(srcdir)/hi22-action-slideshow.png $(DESTDIR)$(icondir)/hicolor/22x22/actions/slideshow.png
- $(INSTALL_DATA) $(srcdir)/hi48-action-rotate_right.png $(DESTDIR)$(icondir)/hicolor/48x48/actions/rotate_right.png
-- $(INSTALL_DATA) $(srcdir)/hi48-action-slideshow.png $(DESTDIR)$(icondir)/hicolor/48x48/actions/slideshow.png
++ $(INSTALL_DATA) $(srcdir)/hi48-action-rotate_right.png $(DESTDIR)$(icondir)/hicolor/48x48/actions/rotate_right.png
+ $(INSTALL_DATA) $(srcdir)/hi32-action-slideshow.png $(DESTDIR)$(icondir)/hicolor/32x32/actions/slideshow.png
+ $(INSTALL_DATA) $(srcdir)/hi32-action-flip.png $(DESTDIR)$(icondir)/hicolor/32x32/actions/flip.png
-+ $(INSTALL_DATA) $(srcdir)/hi22-action-smallthumbnails.png $(DESTDIR)$(icondir)/hicolor/22x22/actions/smallthumbnails.png
uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(icondir)/hicolor/48x48/actions/rotate_left.png
+- -rm -f $(DESTDIR)$(icondir)/hicolor/48x48/actions/mirror.png
+- -rm -f $(DESTDIR)$(icondir)/hicolor/scalable/actions/slideshow.svgz
+- -rm -f $(DESTDIR)$(icondir)/hicolor/32x32/actions/flip.png
+- -rm -f $(DESTDIR)$(icondir)/hicolor/32x32/actions/rotate_right.png
+- -rm -f $(DESTDIR)$(icondir)/hicolor/16x16/actions/flip.png
+- -rm -f $(DESTDIR)$(icondir)/hicolor/16x16/actions/rotate_right.png
+- -rm -f $(DESTDIR)$(icondir)/hicolor/22x22/actions/slideshow.png
+- -rm -f $(DESTDIR)$(icondir)/hicolor/32x32/actions/slideshow.png
+- -rm -f $(DESTDIR)$(icondir)/hicolor/16x16/actions/slideshow.png
+ -rm -f $(DESTDIR)$(icondir)/hicolor/22x22/actions/rotate_left.png
-+ -rm -f $(DESTDIR)$(icondir)/hicolor/32x32/actions/gvfirst.png
-+ -rm -f $(DESTDIR)$(icondir)/hicolor/32x32/actions/largethumbnails.png
+ -rm -f $(DESTDIR)$(icondir)/hicolor/32x32/actions/rotate_left.png
+ -rm -f $(DESTDIR)$(icondir)/hicolor/22x22/actions/rotate_right.png
-+ -rm -f $(DESTDIR)$(icondir)/hicolor/32x32/actions/medthumbnails.png
+ -rm -f $(DESTDIR)$(icondir)/hicolor/48x48/actions/flip.png
-+ -rm -f $(DESTDIR)$(icondir)/hicolor/48x48/actions/slideshow.png
+ -rm -f $(DESTDIR)$(icondir)/hicolor/48x48/actions/slideshow.png
+- -rm -f $(DESTDIR)$(icondir)/hicolor/32x32/actions/mirror.png
+- -rm -f $(DESTDIR)$(icondir)/hicolor/16x16/actions/mirror.png
+ -rm -f $(DESTDIR)$(icondir)/hicolor/16x16/actions/slideshow.png
+ -rm -f $(DESTDIR)$(icondir)/hicolor/16x16/actions/rotate_right.png
-+ -rm -f $(DESTDIR)$(icondir)/hicolor/22x22/actions/medthumbnails.png
-rm -f $(DESTDIR)$(icondir)/hicolor/16x16/actions/dnd1.png
-rm -f $(DESTDIR)$(icondir)/hicolor/16x16/actions/dnd2.png
+- -rm -f $(DESTDIR)$(icondir)/hicolor/22x22/actions/flip.png
+- -rm -f $(DESTDIR)$(icondir)/hicolor/22x22/actions/rotate_right.png
-rm -f $(DESTDIR)$(icondir)/hicolor/16x16/actions/dnd3.png
-@@ -531,44 +557,42 @@
+ -rm -f $(DESTDIR)$(icondir)/hicolor/16x16/actions/dnd4.png
+ -rm -f $(DESTDIR)$(icondir)/hicolor/16x16/actions/dnd5.png
+ -rm -f $(DESTDIR)$(icondir)/hicolor/16x16/actions/dnd6.png
-rm -f $(DESTDIR)$(icondir)/hicolor/16x16/actions/dnd7.png
-rm -f $(DESTDIR)$(icondir)/hicolor/16x16/actions/dnd8.png
- -rm -f $(DESTDIR)$(icondir)/hicolor/16x16/actions/flip.png
-+ -rm -f $(DESTDIR)$(icondir)/hicolor/22x22/actions/largethumbnails.png
-+ -rm -f $(DESTDIR)$(icondir)/hicolor/22x22/actions/gvnext.png
- -rm -f $(DESTDIR)$(icondir)/hicolor/16x16/actions/mirror.png
-- -rm -f $(DESTDIR)$(icondir)/hicolor/16x16/actions/rotate_left.png
-- -rm -f $(DESTDIR)$(icondir)/hicolor/16x16/actions/rotate_right.png
-- -rm -f $(DESTDIR)$(icondir)/hicolor/16x16/actions/slideshow.png
-+ -rm -f $(DESTDIR)$(icondir)/hicolor/32x32/actions/gvprevious.png
- -rm -f $(DESTDIR)$(icondir)/hicolor/22x22/actions/flip.png
-- -rm -f $(DESTDIR)$(icondir)/hicolor/22x22/actions/gvfirst.png
-- -rm -f $(DESTDIR)$(icondir)/hicolor/22x22/actions/gvlast.png
-- -rm -f $(DESTDIR)$(icondir)/hicolor/22x22/actions/gvnext.png
-- -rm -f $(DESTDIR)$(icondir)/hicolor/22x22/actions/gvprevious.png
-- -rm -f $(DESTDIR)$(icondir)/hicolor/22x22/actions/largethumbnails.png
-- -rm -f $(DESTDIR)$(icondir)/hicolor/22x22/actions/medthumbnails.png
-- -rm -f $(DESTDIR)$(icondir)/hicolor/22x22/actions/mirror.png
+- -rm -f $(DESTDIR)$(icondir)/hicolor/48x48/actions/flip.png
+- -rm -f $(DESTDIR)$(icondir)/hicolor/48x48/actions/rotate_right.png
- -rm -f $(DESTDIR)$(icondir)/hicolor/22x22/actions/rotate_left.png
-- -rm -f $(DESTDIR)$(icondir)/hicolor/22x22/actions/rotate_right.png
-- -rm -f $(DESTDIR)$(icondir)/hicolor/22x22/actions/slideshow.png
-- -rm -f $(DESTDIR)$(icondir)/hicolor/22x22/actions/smallthumbnails.png
-- -rm -f $(DESTDIR)$(icondir)/hicolor/32x32/actions/flip.png
-- -rm -f $(DESTDIR)$(icondir)/hicolor/32x32/actions/gvfirst.png
-- -rm -f $(DESTDIR)$(icondir)/hicolor/32x32/actions/gvlast.png
- -rm -f $(DESTDIR)$(icondir)/hicolor/32x32/actions/gvnext.png
-- -rm -f $(DESTDIR)$(icondir)/hicolor/32x32/actions/gvprevious.png
-- -rm -f $(DESTDIR)$(icondir)/hicolor/32x32/actions/largethumbnails.png
-- -rm -f $(DESTDIR)$(icondir)/hicolor/32x32/actions/medthumbnails.png
-- -rm -f $(DESTDIR)$(icondir)/hicolor/32x32/actions/mirror.png
- -rm -f $(DESTDIR)$(icondir)/hicolor/32x32/actions/rotate_left.png
-+ -rm -f $(DESTDIR)$(icondir)/hicolor/22x22/actions/gvprevious.png
-+ -rm -f $(DESTDIR)$(icondir)/hicolor/16x16/actions/rotate_left.png
-+ -rm -f $(DESTDIR)$(icondir)/hicolor/22x22/actions/gvlast.png
-+ -rm -f $(DESTDIR)$(icondir)/hicolor/22x22/actions/gvfirst.png
- -rm -f $(DESTDIR)$(icondir)/hicolor/32x32/actions/rotate_right.png
-- -rm -f $(DESTDIR)$(icondir)/hicolor/32x32/actions/slideshow.png
- -rm -f $(DESTDIR)$(icondir)/hicolor/32x32/actions/smallthumbnails.png
-- -rm -f $(DESTDIR)$(icondir)/hicolor/48x48/actions/flip.png
+- -rm -f $(DESTDIR)$(icondir)/hicolor/22x22/actions/mirror.png
++ -rm -f $(DESTDIR)$(icondir)/hicolor/16x16/actions/flip.png
++ -rm -f $(DESTDIR)$(icondir)/hicolor/scalable/actions/slideshow.svgz
++ -rm -f $(DESTDIR)$(icondir)/hicolor/16x16/actions/mirror.png
++ -rm -f $(DESTDIR)$(icondir)/hicolor/22x22/actions/flip.png
+ -rm -f $(DESTDIR)$(icondir)/hicolor/16x16/actions/rotate_left.png
++ -rm -f $(DESTDIR)$(icondir)/hicolor/32x32/actions/rotate_right.png
+ -rm -f $(DESTDIR)$(icondir)/hicolor/22x22/actions/mirror.png
-+ -rm -f $(DESTDIR)$(icondir)/hicolor/32x32/actions/gvlast.png
- -rm -f $(DESTDIR)$(icondir)/hicolor/48x48/actions/mirror.png
- -rm -f $(DESTDIR)$(icondir)/hicolor/48x48/actions/rotate_left.png
++ -rm -f $(DESTDIR)$(icondir)/hicolor/48x48/actions/mirror.png
++ -rm -f $(DESTDIR)$(icondir)/hicolor/48x48/actions/rotate_left.png
+ -rm -f $(DESTDIR)$(icondir)/hicolor/32x32/actions/mirror.png
+ -rm -f $(DESTDIR)$(icondir)/hicolor/22x22/actions/slideshow.png
- -rm -f $(DESTDIR)$(icondir)/hicolor/48x48/actions/rotate_right.png
-- -rm -f $(DESTDIR)$(icondir)/hicolor/48x48/actions/slideshow.png
++ -rm -f $(DESTDIR)$(icondir)/hicolor/48x48/actions/rotate_right.png
+ -rm -f $(DESTDIR)$(icondir)/hicolor/32x32/actions/slideshow.png
+ -rm -f $(DESTDIR)$(icondir)/hicolor/32x32/actions/flip.png
-+ -rm -f $(DESTDIR)$(icondir)/hicolor/22x22/actions/smallthumbnails.png
-#>+ 6
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu pics/action/Makefile
+- $(AUTOMAKE) --gnu src/pics/action/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -35771,19 +24428,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pics/action/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/action/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign pics/action/Makefile
- cd $(top_srcdir) && perl admin/am_edit pics/action/Makefile.in
++ $(AUTOMAKE) --foreign src/pics/action/Makefile
+ cd $(top_srcdir) && perl admin/am_edit src/pics/action/Makefile.in
-diff -Nru gwenview-1.2.0.orig/pics/app/Makefile.in gwenview-1.2.0/pics/app/Makefile.in
---- gwenview-1.2.0.orig/pics/app/Makefile.in 2005-04-03 13:19:02.000000000 +0000
-+++ gwenview-1.2.0/pics/app/Makefile.in 2005-07-26 19:28:12.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/src/pics/app/Makefile.in gwenview-1.3.0/src/pics/app/Makefile.in
+--- gwenview-1.3.0.orig/src/pics/app/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/src/pics/app/Makefile.in 2005-09-12 08:43:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -35804,7 +24461,7 @@
@@ -22,7 +21,6 @@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
+ top_builddir = ../../..
-
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
@@ -35813,7 +24470,7 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = pics/app
++subdir = src/pics/app
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -35831,15 +24488,7 @@
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +124,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +163,9 @@
+@@ -164,6 +177,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -35849,7 +24498,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +222,8 @@
+@@ -222,6 +238,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -35858,68 +24507,19 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +231,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +269,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +291,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -299,27 +293,53 @@
+@@ -298,27 +317,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
KDE_ICON = AUTO
--subdir = pics/app
+-subdir = src/pics/app
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -35941,11 +24541,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pics/app/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/app/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu pics/app/Makefile
+-#>- $(AUTOMAKE) --gnu src/pics/app/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign pics/app/Makefile
++#>- $(AUTOMAKE) --foreign src/pics/app/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -35955,11 +24555,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pics/app/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/app/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu pics/app/Makefile
-+ $(AUTOMAKE) --foreign pics/app/Makefile
- cd $(top_srcdir) && perl admin/am_edit pics/app/Makefile.in
+- $(AUTOMAKE) --gnu src/pics/app/Makefile
++ $(AUTOMAKE) --foreign src/pics/app/Makefile
+ cd $(top_srcdir) && perl admin/am_edit src/pics/app/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -35982,7 +24582,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -336,12 +356,6 @@
+@@ -335,12 +380,6 @@
ctags: CTAGS
CTAGS:
@@ -35990,12 +24590,12 @@
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -355,7 +369,7 @@
+@@ -354,7 +393,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -36004,7 +24604,7 @@
else \
dir=''; \
fi; \
-@@ -373,7 +387,6 @@
+@@ -372,7 +411,6 @@
check-am: all-am
check: check-am
all-am: Makefile
@@ -36012,7 +24612,7 @@
installdirs:
install: install-am
install-exec: install-exec-am
-@@ -394,7 +407,7 @@
+@@ -393,7 +431,7 @@
clean-generic:
distclean-generic:
@@ -36021,7 +24621,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -415,6 +428,8 @@
+@@ -414,6 +452,8 @@
dvi-am:
@@ -36030,7 +24630,7 @@
info: info-am
info-am:
-@@ -453,10 +468,10 @@
+@@ -452,10 +492,10 @@
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
@@ -36045,53 +24645,52 @@
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
uninstall-info-am
-@@ -466,38 +481,47 @@
+@@ -465,7 +505,7 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=cr22-app-gwenview.png cr128-app-gwenview.png cr64-app-gwenview.png cr16-app-gwenview.png gwenview.svg cr48-app-gwenview.png gwenview.svgz Makefile.in cr32-app-gwenview.png
-+KDE_DIST=cr22-app-gwenview.png cr128-app-gwenview.png cr64-app-gwenview.png cr16-app-gwenview.png gwenview.svg cr48-app-gwenview.png gwenview.svgz Makefile.in cr32-app-gwenview.png Makefile.am
+-KDE_DIST=hisc-app-gwenview.svgz hi32-app-gwenview.png hi64-app-gwenview.png hi22-app-gwenview.png hi48-app-gwenview.png hi128-app-gwenview.png Makefile.in hi16-app-gwenview.png
++KDE_DIST=hisc-app-gwenview.svgz hi32-app-gwenview.png hi64-app-gwenview.png hi22-app-gwenview.png hi48-app-gwenview.png hi128-app-gwenview.png Makefile.in hi16-app-gwenview.png Makefile.am
#>+ 2
docs-am:
-
- #>+ 22
+@@ -474,32 +514,41 @@
install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-- $(INSTALL_DATA) $(srcdir)/cr128-app-gwenview.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/gwenview.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-gwenview.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gwenview.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-- $(INSTALL_DATA) $(srcdir)/cr22-app-gwenview.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/gwenview.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-gwenview.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gwenview.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-gwenview.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/gwenview.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-gwenview.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gwenview.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-gwenview.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gwenview.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-gwenview.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gwenview.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-gwenview.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/gwenview.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-gwenview.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/gwenview.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-gwenview.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/gwenview.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/hi64-app-gwenview.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/gwenview.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+ $(INSTALL_DATA) $(srcdir)/hi128-app-gwenview.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/gwenview.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+ $(INSTALL_DATA) $(srcdir)/hisc-app-gwenview.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/gwenview.svgz
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-gwenview.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/gwenview.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-gwenview.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/gwenview.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-gwenview.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/gwenview.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-gwenview.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/gwenview.png
uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/gwenview.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gwenview.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/gwenview.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gwenview.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/gwenview.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gwenview.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gwenview.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gwenview.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/gwenview.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/gwenview.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/gwenview.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/gwenview.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/gwenview.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/gwenview.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/gwenview.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/gwenview.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/gwenview.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/gwenview.png
-#>+ 6
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu pics/app/Makefile
+- $(AUTOMAKE) --gnu src/pics/app/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -36100,19 +24699,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pics/app/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/app/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign pics/app/Makefile
- cd $(top_srcdir) && perl admin/am_edit pics/app/Makefile.in
++ $(AUTOMAKE) --foreign src/pics/app/Makefile
+ cd $(top_srcdir) && perl admin/am_edit src/pics/app/Makefile.in
-diff -Nru gwenview-1.2.0.orig/pics/cursor/Makefile.in gwenview-1.2.0/pics/cursor/Makefile.in
---- gwenview-1.2.0.orig/pics/cursor/Makefile.in 2005-04-03 13:19:02.000000000 +0000
-+++ gwenview-1.2.0/pics/cursor/Makefile.in 2005-07-26 19:28:12.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/src/pics/cursor/Makefile.in gwenview-1.3.0/src/pics/cursor/Makefile.in
+--- gwenview-1.3.0.orig/src/pics/cursor/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/src/pics/cursor/Makefile.in 2005-09-12 08:43:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -36125,7 +24724,7 @@
@@ -22,7 +22,6 @@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
+ top_builddir = ../../..
-
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
@@ -36134,7 +24733,7 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = pics/cursor
++subdir = src/pics/cursor
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -36161,15 +24760,7 @@
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +134,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +173,9 @@
+@@ -164,6 +187,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -36179,7 +24770,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +232,8 @@
+@@ -222,6 +248,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -36188,68 +24779,19 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +241,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +279,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +301,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -300,29 +304,53 @@
+@@ -299,29 +328,53 @@
xdg_menudir = @xdg_menudir@
cursorsdir = $(kde_datadir)/gwenview/cursors
- cursors_DATA = drag.png dragging.png zoom.png
--subdir = pics/cursor
+ cursors_DATA = zoom.png
+-subdir = src/pics/cursor
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -36273,11 +24815,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pics/cursor/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/cursor/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu pics/cursor/Makefile
+-#>- $(AUTOMAKE) --gnu src/pics/cursor/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign pics/cursor/Makefile
++#>- $(AUTOMAKE) --foreign src/pics/cursor/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -36287,11 +24829,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pics/cursor/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/cursor/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu pics/cursor/Makefile
-+ $(AUTOMAKE) --foreign pics/cursor/Makefile
- cd $(top_srcdir) && perl admin/am_edit pics/cursor/Makefile.in
+- $(AUTOMAKE) --gnu src/pics/cursor/Makefile
++ $(AUTOMAKE) --foreign src/pics/cursor/Makefile
+ cd $(top_srcdir) && perl admin/am_edit src/pics/cursor/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -36314,7 +24856,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -333,23 +361,22 @@
+@@ -332,23 +385,22 @@
distclean-libtool:
-rm -f libtool
uninstall-info-am:
@@ -36345,7 +24887,7 @@
done
tags: TAGS
TAGS:
-@@ -357,12 +384,6 @@
+@@ -356,12 +408,6 @@
ctags: CTAGS
CTAGS:
@@ -36353,12 +24895,12 @@
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -376,7 +397,7 @@
+@@ -375,7 +421,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -36367,7 +24909,7 @@
else \
dir=''; \
fi; \
-@@ -394,9 +415,10 @@
+@@ -393,9 +439,10 @@
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
@@ -36380,7 +24922,7 @@
install: install-am
install-exec: install-exec-am
install-data: install-data-am
-@@ -416,7 +438,7 @@
+@@ -415,7 +462,7 @@
clean-generic:
distclean-generic:
@@ -36389,7 +24931,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -437,6 +459,8 @@
+@@ -436,6 +483,8 @@
dvi-am:
@@ -36398,7 +24940,7 @@
info: info-am
info-am:
-@@ -471,28 +495,37 @@
+@@ -470,28 +519,37 @@
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
@@ -36422,8 +24964,8 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=zoom.png dragging.png drag.png Makefile.in
-+KDE_DIST=zoom.png dragging.png drag.png Makefile.in Makefile.am
+-KDE_DIST=zoom.png Makefile.in
++KDE_DIST=zoom.png Makefile.in Makefile.am
#>+ 2
docs-am:
@@ -36432,7 +24974,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu pics/cursor/Makefile
+- $(AUTOMAKE) --gnu src/pics/cursor/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -36441,19 +24983,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pics/cursor/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/cursor/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign pics/cursor/Makefile
- cd $(top_srcdir) && perl admin/am_edit pics/cursor/Makefile.in
++ $(AUTOMAKE) --foreign src/pics/cursor/Makefile
+ cd $(top_srcdir) && perl admin/am_edit src/pics/cursor/Makefile.in
-diff -Nru gwenview-1.2.0.orig/pics/Makefile.in gwenview-1.2.0/pics/Makefile.in
---- gwenview-1.2.0.orig/pics/Makefile.in 2005-04-03 13:19:02.000000000 +0000
-+++ gwenview-1.2.0/pics/Makefile.in 2005-07-26 19:28:12.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/src/pics/Makefile.in gwenview-1.3.0/src/pics/Makefile.in
+--- gwenview-1.3.0.orig/src/pics/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/src/pics/Makefile.in 2005-09-12 08:43:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -36474,7 +25016,7 @@
@@ -22,7 +21,6 @@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ..
+ top_builddir = ../..
-
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
@@ -36483,7 +25025,7 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = pics
++subdir = src/pics
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -36517,15 +25059,7 @@
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +140,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +179,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -36535,7 +25069,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +238,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -36544,68 +25078,19 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +247,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +285,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -299,40 +309,53 @@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
SUBDIRS = action app cursor thumbnail
--subdir = pics
+-subdir = src/pics
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -36640,11 +25125,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pics/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu pics/Makefile
+-#>- $(AUTOMAKE) --gnu src/pics/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign pics/Makefile
++#>- $(AUTOMAKE) --foreign src/pics/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -36654,11 +25139,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pics/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu pics/Makefile
-+ $(AUTOMAKE) --foreign pics/Makefile
- cd $(top_srcdir) && perl admin/am_edit pics/Makefile.in
+- $(AUTOMAKE) --gnu src/pics/Makefile
++ $(AUTOMAKE) --foreign src/pics/Makefile
+ cd $(top_srcdir) && perl admin/am_edit src/pics/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -36681,7 +25166,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -351,7 +374,13 @@
+@@ -350,7 +398,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):
@@ -36696,7 +25181,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -363,7 +392,7 @@
+@@ -362,7 +416,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -36705,7 +25190,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -371,7 +400,13 @@
+@@ -370,7 +424,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -36720,7 +25205,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -392,7 +427,7 @@
+@@ -391,7 +451,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -36729,7 +25214,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -403,14 +438,6 @@
+@@ -402,14 +462,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -36744,7 +25229,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -419,19 +446,22 @@
+@@ -418,19 +470,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -36769,7 +25254,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -441,10 +471,11 @@
+@@ -440,10 +495,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -36785,7 +25270,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -467,12 +498,6 @@
+@@ -466,12 +522,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -36793,12 +25278,12 @@
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ..
+-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -486,7 +511,7 @@
+@@ -485,7 +535,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -36807,7 +25292,7 @@
else \
dir=''; \
fi; \
-@@ -501,15 +526,17 @@
+@@ -500,15 +550,17 @@
|| exit 1; \
fi; \
done
@@ -36830,7 +25315,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -519,7 +546,6 @@
+@@ -518,7 +570,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -36838,7 +25323,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -539,7 +565,7 @@
+@@ -538,7 +589,7 @@
clean-generic:
distclean-generic:
@@ -36847,7 +25332,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -561,6 +587,8 @@
+@@ -560,6 +611,8 @@
dvi-am:
@@ -36856,7 +25341,7 @@
info: info-recursive
info-am:
-@@ -595,37 +623,42 @@
+@@ -594,37 +647,42 @@
uninstall-info: uninstall-info-recursive
@@ -36903,7 +25388,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu pics/Makefile
+- $(AUTOMAKE) --gnu src/pics/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -36912,19 +25397,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pics/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign pics/Makefile
- cd $(top_srcdir) && perl admin/am_edit pics/Makefile.in
++ $(AUTOMAKE) --foreign src/pics/Makefile
+ cd $(top_srcdir) && perl admin/am_edit src/pics/Makefile.in
-diff -Nru gwenview-1.2.0.orig/pics/thumbnail/Makefile.in gwenview-1.2.0/pics/thumbnail/Makefile.in
---- gwenview-1.2.0.orig/pics/thumbnail/Makefile.in 2005-04-03 13:19:02.000000000 +0000
-+++ gwenview-1.2.0/pics/thumbnail/Makefile.in 2005-07-26 19:28:12.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/src/pics/thumbnail/Makefile.in gwenview-1.3.0/src/pics/thumbnail/Makefile.in
+--- gwenview-1.3.0.orig/src/pics/thumbnail/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/src/pics/thumbnail/Makefile.in 2005-09-12 08:43:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -36937,7 +25422,7 @@
@@ -22,7 +22,6 @@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
+ top_builddir = ../../..
-
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
@@ -36946,7 +25431,7 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = pics/thumbnail
++subdir = src/pics/thumbnail
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -36973,15 +25458,7 @@
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +134,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +173,9 @@
+@@ -164,6 +187,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -36991,7 +25468,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +232,8 @@
+@@ -222,6 +248,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -37000,68 +25477,19 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +241,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +279,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +301,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -300,29 +304,53 @@
+@@ -299,29 +328,53 @@
xdg_menudir = @xdg_menudir@
thumbnaildir = $(kde_datadir)/gwenview/thumbnail
thumbnail_DATA = wait.png
--subdir = pics/thumbnail
+-subdir = src/pics/thumbnail
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -37085,11 +25513,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pics/thumbnail/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/thumbnail/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu pics/thumbnail/Makefile
+-#>- $(AUTOMAKE) --gnu src/pics/thumbnail/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign pics/thumbnail/Makefile
++#>- $(AUTOMAKE) --foreign src/pics/thumbnail/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -37099,11 +25527,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pics/thumbnail/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/thumbnail/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu pics/thumbnail/Makefile
-+ $(AUTOMAKE) --foreign pics/thumbnail/Makefile
- cd $(top_srcdir) && perl admin/am_edit pics/thumbnail/Makefile.in
+- $(AUTOMAKE) --gnu src/pics/thumbnail/Makefile
++ $(AUTOMAKE) --foreign src/pics/thumbnail/Makefile
+ cd $(top_srcdir) && perl admin/am_edit src/pics/thumbnail/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -37126,7 +25554,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -333,23 +361,22 @@
+@@ -332,23 +385,22 @@
distclean-libtool:
-rm -f libtool
uninstall-info-am:
@@ -37157,7 +25585,7 @@
done
tags: TAGS
TAGS:
-@@ -357,12 +384,6 @@
+@@ -356,12 +408,6 @@
ctags: CTAGS
CTAGS:
@@ -37165,12 +25593,12 @@
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -376,7 +397,7 @@
+@@ -375,7 +421,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -37179,7 +25607,7 @@
else \
dir=''; \
fi; \
-@@ -394,9 +415,10 @@
+@@ -393,9 +439,10 @@
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
@@ -37192,7 +25620,7 @@
install: install-am
install-exec: install-exec-am
install-data: install-data-am
-@@ -416,7 +438,7 @@
+@@ -415,7 +462,7 @@
clean-generic:
distclean-generic:
@@ -37201,7 +25629,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -437,6 +459,8 @@
+@@ -436,6 +483,8 @@
dvi-am:
@@ -37210,7 +25638,7 @@
info: info-am
info-am:
-@@ -471,28 +495,38 @@
+@@ -470,28 +519,38 @@
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
@@ -37245,7 +25673,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu pics/thumbnail/Makefile
+- $(AUTOMAKE) --gnu src/pics/thumbnail/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -37254,19 +25682,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pics/thumbnail/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/thumbnail/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign pics/thumbnail/Makefile
- cd $(top_srcdir) && perl admin/am_edit pics/thumbnail/Makefile.in
++ $(AUTOMAKE) --foreign src/pics/thumbnail/Makefile
+ cd $(top_srcdir) && perl admin/am_edit src/pics/thumbnail/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/ar/Makefile.in gwenview-1.2.0/po/ar/Makefile.in
---- gwenview-1.2.0.orig/po/ar/Makefile.in 2005-04-03 13:19:02.000000000 +0000
-+++ gwenview-1.2.0/po/ar/Makefile.in 2005-07-26 19:28:12.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/src/tools/Makefile.in gwenview-1.3.0/src/tools/Makefile.in
+--- gwenview-1.3.0.orig/src/tools/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/src/tools/Makefile.in 2005-09-12 08:43:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -37276,6 +25704,803 @@
# 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,6 +15,7 @@
+
+ @SET_MAKE@
+
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +23,6 @@
+ 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
+@@ -39,6 +39,34 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = src/tools
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++am__installdirs = "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(toolsdir)" \
++ "$(DESTDIR)$(updatedir)"
++updateSCRIPT_INSTALL = $(INSTALL_SCRIPT)
++SCRIPTS = $(update_SCRIPTS)
++SOURCES =
++DIST_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|^.*/||'`;
++toolsDATA_INSTALL = $(INSTALL_DATA)
++updateDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(tools_DATA) $(update_DATA)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +192,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +253,8 @@
+ 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@
+@@ -273,6 +306,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -301,46 +335,65 @@
+ tools_DATA = gimp.desktop wallpaper.desktop tiledwallpaper.desktop \
+ konqueror.desktop
+
+-
+ update_DATA = gwenview_thumbnail_size.upd
+ update_SCRIPTS = gwenview_thumbnail_size.sh
+-
+ updatedir = $(kde_datadir)/kconf_update
+-subdir = src/tools
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-SCRIPTS = $(update_SCRIPTS)
+-
+-DIST_SOURCES =
+-DATA = $(tools_DATA) $(update_DATA)
+-
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ #>- all: all-am
+ #>+ 1
+ all: docs-am all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/tools/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu src/tools/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign src/tools/Makefile
++#>+ 12
++ @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) --foreign src/tools/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu src/tools/Makefile
++ $(AUTOMAKE) --foreign src/tools/Makefile
+ cd $(top_srcdir) && perl admin/am_edit src/tools/Makefile.in
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-updateSCRIPT_INSTALL = $(INSTALL_SCRIPT)
++.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-updateSCRIPTS: $(update_SCRIPTS)
+ @$(NORMAL_INSTALL)
+- $(mkinstalldirs) $(DESTDIR)$(updatedir)
++ test -z "$(updatedir)" || $(mkdir_p) "$(DESTDIR)$(updatedir)"
+ @list='$(update_SCRIPTS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f $$d$$p; then \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+- echo " $(updateSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(updatedir)/$$f"; \
+- $(updateSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(updatedir)/$$f; \
++ echo " $(updateSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(updatedir)/$$f'"; \
++ $(updateSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(updatedir)/$$f"; \
+ else :; fi; \
+ done
+
+@@ -348,8 +401,8 @@
+ @$(NORMAL_UNINSTALL)
+ @list='$(update_SCRIPTS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+- echo " rm -f $(DESTDIR)$(updatedir)/$$f"; \
+- rm -f $(DESTDIR)$(updatedir)/$$f; \
++ echo " rm -f '$(DESTDIR)$(updatedir)/$$f'"; \
++ rm -f "$(DESTDIR)$(updatedir)/$$f"; \
+ done
+
+ mostlyclean-libtool:
+@@ -361,41 +414,39 @@
+ distclean-libtool:
+ -rm -f libtool
+ uninstall-info-am:
+-toolsDATA_INSTALL = $(INSTALL_DATA)
+ install-toolsDATA: $(tools_DATA)
+ @$(NORMAL_INSTALL)
+- $(mkinstalldirs) $(DESTDIR)$(toolsdir)
++ test -z "$(toolsdir)" || $(mkdir_p) "$(DESTDIR)$(toolsdir)"
+ @list='$(tools_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f="`echo $$p | sed -e 's|^.*/||'`"; \
+- echo " $(toolsDATA_INSTALL) $$d$$p $(DESTDIR)$(toolsdir)/$$f"; \
+- $(toolsDATA_INSTALL) $$d$$p $(DESTDIR)$(toolsdir)/$$f; \
++ f=$(am__strip_dir) \
++ echo " $(toolsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(toolsdir)/$$f'"; \
++ $(toolsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(toolsdir)/$$f"; \
+ done
+
+ uninstall-toolsDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(tools_DATA)'; for p in $$list; do \
+- f="`echo $$p | sed -e 's|^.*/||'`"; \
+- echo " rm -f $(DESTDIR)$(toolsdir)/$$f"; \
+- rm -f $(DESTDIR)$(toolsdir)/$$f; \
++ f=$(am__strip_dir) \
++ echo " rm -f '$(DESTDIR)$(toolsdir)/$$f'"; \
++ rm -f "$(DESTDIR)$(toolsdir)/$$f"; \
+ done
+-updateDATA_INSTALL = $(INSTALL_DATA)
+ install-updateDATA: $(update_DATA)
+ @$(NORMAL_INSTALL)
+- $(mkinstalldirs) $(DESTDIR)$(updatedir)
++ test -z "$(updatedir)" || $(mkdir_p) "$(DESTDIR)$(updatedir)"
+ @list='$(update_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f="`echo $$p | sed -e 's|^.*/||'`"; \
+- echo " $(updateDATA_INSTALL) $$d$$p $(DESTDIR)$(updatedir)/$$f"; \
+- $(updateDATA_INSTALL) $$d$$p $(DESTDIR)$(updatedir)/$$f; \
++ f=$(am__strip_dir) \
++ echo " $(updateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(updatedir)/$$f'"; \
++ $(updateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(updatedir)/$$f"; \
+ done
+
+ uninstall-updateDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(update_DATA)'; for p in $$list; do \
+- f="`echo $$p | sed -e 's|^.*/||'`"; \
+- echo " rm -f $(DESTDIR)$(updatedir)/$$f"; \
+- rm -f $(DESTDIR)$(updatedir)/$$f; \
++ f=$(am__strip_dir) \
++ echo " rm -f '$(DESTDIR)$(updatedir)/$$f'"; \
++ rm -f "$(DESTDIR)$(updatedir)/$$f"; \
+ done
+ tags: TAGS
+ TAGS:
+@@ -403,12 +454,6 @@
+ ctags: CTAGS
+ CTAGS:
+
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -422,7 +467,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -440,9 +485,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(SCRIPTS) $(DATA)
+-
+ installdirs:
+- $(mkinstalldirs) $(DESTDIR)$(updatedir) $(DESTDIR)$(toolsdir) $(DESTDIR)$(updatedir)
++ for dir in "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(toolsdir)" "$(DESTDIR)$(updatedir)"; do \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
++ done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -462,7 +508,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"
+@@ -483,6 +529,8 @@
+
+ dvi-am:
+
++html: html-am
++
+ info: info-am
+
+ info-am:
+@@ -514,16 +562,16 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-info-am uninstall-toolsDATA uninstall-updateDATA \
+- uninstall-updateSCRIPTS
++uninstall-am: uninstall-info-am uninstall-toolsDATA \
++ uninstall-updateDATA uninstall-updateSCRIPTS
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+- dvi-am info info-am install install-am install-data \
+- install-data-am install-exec install-exec-am install-info \
+- install-info-am install-man install-strip install-toolsDATA \
+- install-updateDATA install-updateSCRIPTS installcheck \
+- installcheck-am installdirs maintainer-clean \
++ dvi-am html html-am info info-am install install-am \
++ install-data install-data-am install-exec install-exec-am \
++ install-info install-info-am install-man install-strip \
++ install-toolsDATA install-updateDATA install-updateSCRIPTS \
++ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+ uninstall-info-am uninstall-toolsDATA uninstall-updateDATA \
+@@ -534,15 +582,24 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=gwenview_thumbnail_size.sh wallpaper.desktop tiledwallpaper.desktop gimp.desktop konqueror.desktop Makefile.in gwenview_thumbnail_size.upd
++KDE_DIST=wallpaper.desktop gwenview_thumbnail_size.sh tiledwallpaper.desktop gimp.desktop Makefile.in konqueror.desktop gwenview_thumbnail_size.upd Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu src/tools/Makefile
++ @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) --foreign src/tools/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign src/tools/Makefile
+ cd $(top_srcdir) && perl admin/am_edit src/tools/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/src/tsthread/Makefile.in gwenview-1.3.0/src/tsthread/Makefile.in
+--- gwenview-1.3.0.orig/src/tsthread/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/src/tsthread/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 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,6 +15,7 @@
+
+ @SET_MAKE@
+
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +23,6 @@
+ 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
+@@ -39,6 +39,55 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = src/tsthread
++DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
++ $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(noinst_LTLIBRARIES)
++libtsthread_la_LIBADD =
++am_libtsthread_la_OBJECTS = tsthread.lo tswaitcondition.lo
++#>- libtsthread_la_OBJECTS = $(am_libtsthread_la_OBJECTS)
++#>+ 4
++libtsthread_la_final_OBJECTS = libtsthread_la.all_cpp.lo
++libtsthread_la_nofinal_OBJECTS = tsthread.lo tswaitcondition.lo
++ at KDE_USE_FINAL_FALSE@libtsthread_la_OBJECTS = $(libtsthread_la_nofinal_OBJECTS)
++ at KDE_USE_FINAL_TRUE@libtsthread_la_OBJECTS = $(libtsthread_la_final_OBJECTS)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
++am__depfiles_maybe = depfiles
++#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 2
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++#>- $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++CXXLD = $(CXX)
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 2
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(libtsthread_la_SOURCES)
++DIST_SOURCES = $(libtsthread_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++ETAGS = etags
++CTAGS = ctags
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +213,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +274,8 @@
+ 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@
+@@ -273,6 +327,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -298,91 +353,69 @@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ INCLUDES = -I$(srcdir) -I$(srcdir)/.. $(all_includes)
+-
+ noinst_LTLIBRARIES = libtsthread.la
+-
+ libtsthread_la_SOURCES = \
+ tsthread.cpp \
+ tswaitcondition.cpp
+
+-
+ noinst_HEADERS = \
+ tsthread.h
+
+-
+ #>- METASOURCES = AUTO
+-subdir = src/tsthread
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
+-
+-libtsthread_la_LDFLAGS =
+-libtsthread_la_LIBADD =
+-am_libtsthread_la_OBJECTS = tsthread.lo tswaitcondition.lo
+-#>- libtsthread_la_OBJECTS = $(am_libtsthread_la_OBJECTS)
+-#>+ 4
+-libtsthread_la_final_OBJECTS = libtsthread_la.all_cpp.lo
+-libtsthread_la_nofinal_OBJECTS = tsthread.lo tswaitcondition.lo
+- at KDE_USE_FINAL_FALSE@libtsthread_la_OBJECTS = $(libtsthread_la_nofinal_OBJECTS)
+- at KDE_USE_FINAL_TRUE@libtsthread_la_OBJECTS = $(libtsthread_la_final_OBJECTS)
+-
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+-am__depfiles_maybe = depfiles
+-#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/tsthread.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/tswaitcondition.Plo
+-#>+ 4
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libtsthread_la.all_cpp.P ./$(DEPDIR)/tsthread.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/tswaitcondition.Plo
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/tsthread.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/tswaitcondition.Plo
+-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 2
+-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+-#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- $(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+-#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DIST_SOURCES = $(libtsthread_la_SOURCES)
+-HEADERS = $(noinst_HEADERS)
+-
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in Makefile.am
+-SOURCES = $(libtsthread_la_SOURCES)
+-
+ #>- all: all-am
+ #>+ 1
+ all: docs-am all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/tsthread/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu src/tsthread/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign src/tsthread/Makefile
++#>+ 12
++ @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) --foreign src/tsthread/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu src/tsthread/Makefile
++ $(AUTOMAKE) --foreign src/tsthread/Makefile
+ cd $(top_srcdir) && perl admin/am_edit src/tsthread/Makefile.in
+-Makefile: $(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
+@@ -390,7 +423,7 @@
+ $(CXXLINK) $(libtsthread_la_LDFLAGS) $(libtsthread_la_OBJECTS) $(libtsthread_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT) core *.core
++ -rm -f *.$(OBJEXT)
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -399,37 +432,25 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tswaitcondition.Plo at am__quote@
+
+ .cpp.o:
+- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@ fi
++ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@ fi
++ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+- at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@ fi
++ at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -441,14 +462,6 @@
+ -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 \
+@@ -457,6 +470,7 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
++tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -468,10 +482,11 @@
+ 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
+-
++ 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)
+@@ -494,12 +509,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -513,7 +522,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -531,7 +540,6 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+-
+ installdirs:
+ install: install-am
+ install-exec: install-exec-am
+@@ -552,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"
+@@ -577,6 +585,8 @@
+
+ dvi-am:
+
++html: html-am
++
+ info: info-am
+
+ info-am:
+@@ -614,13 +624,14 @@
+ .PHONY: CTAGS GTAGS all all-am check check-am 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 \
++ distclean-tags distdir dvi dvi-am html html-am info info-am \
++ install install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
+- pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am
++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++ pdf pdf-am ps ps-am tags uninstall uninstall-am \
++ uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+@@ -638,15 +649,24 @@
+ -rm -f tsthread.moc
+
+ #>+ 2
+-KDE_DIST=tswaitcondition.h Makefile.in
++KDE_DIST=tswaitcondition.h Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu src/tsthread/Makefile
++ @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) --foreign src/tsthread/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign src/tsthread/Makefile
+ cd $(top_srcdir) && perl admin/am_edit src/tsthread/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/ar/Makefile.in gwenview-1.3.0/translations/ar/Makefile.in
+--- gwenview-1.3.0.orig/translations/ar/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/translations/ar/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
@@ -14,7 +14,6 @@
# PARTICULAR PURPOSE.
@@ -37292,11 +26517,11 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/ar
++subdir = translations/ar
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -37326,21 +26551,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -37350,7 +26565,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -37359,78 +26574,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages
+-subdir = translations/ar
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = ar
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ar/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/ar/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/ar/Makefile
++#>+ 12
++ @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) --foreign translations/ar/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/ar/Makefile
++ $(AUTOMAKE) --foreign translations/ar/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ar/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/ar/Makefile
++ @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) --foreign translations/ar/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/ar/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ar/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/ar/messages/Makefile.in gwenview-1.3.0/translations/ar/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/ar/messages/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/translations/ar/messages/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/ar/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/ar
+-subdir = translations/ar/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -37465,11 +27037,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ar/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ar/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/ar/Makefile
+-#>- $(AUTOMAKE) --gnu translations/ar/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/ar/Makefile
++#>- $(AUTOMAKE) --foreign translations/ar/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -37479,11 +27051,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ar/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ar/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/ar/Makefile
-+ $(AUTOMAKE) --foreign po/ar/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/ar/Makefile.in
+- $(AUTOMAKE) --gnu translations/ar/messages/Makefile
++ $(AUTOMAKE) --foreign translations/ar/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ar/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -37506,7 +27078,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -37521,7 +27093,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -37530,7 +27102,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -37545,7 +27117,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -37554,7 +27126,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -37569,7 +27141,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -37594,7 +27166,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -37610,7 +27182,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -37620,12 +27192,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -37634,7 +27206,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -37657,7 +27229,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -37665,7 +27237,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -37674,7 +27246,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -37683,7 +27255,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -37725,7 +27297,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -37733,7 +27305,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/ar/Makefile
+- $(AUTOMAKE) --gnu translations/ar/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -37742,19 +27314,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ar/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ar/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/ar/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/ar/Makefile.in
++ $(AUTOMAKE) --foreign translations/ar/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ar/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/az/Makefile.in gwenview-1.2.0/po/az/Makefile.in
---- gwenview-1.2.0.orig/po/az/Makefile.in 2005-04-03 13:19:02.000000000 +0000
-+++ gwenview-1.2.0/po/az/Makefile.in 2005-07-26 19:28:12.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/az/Makefile.in gwenview-1.3.0/translations/az/Makefile.in
+--- gwenview-1.3.0.orig/translations/az/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/translations/az/Makefile.in 2005-09-12 08:43:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -37780,11 +27352,11 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/az
++subdir = translations/az
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -37814,21 +27386,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -37838,7 +27400,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -37847,78 +27409,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages
+-subdir = translations/az
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = az
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/az/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/az/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/az/Makefile
++#>+ 12
++ @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) --foreign translations/az/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/az/Makefile
++ $(AUTOMAKE) --foreign translations/az/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/az/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/az/Makefile
++ @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) --foreign translations/az/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/az/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/az/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/az/messages/Makefile.in gwenview-1.3.0/translations/az/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/az/messages/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/translations/az/messages/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/az/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/az
+-subdir = translations/az/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -37953,11 +27872,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/az/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/az/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/az/Makefile
+-#>- $(AUTOMAKE) --gnu translations/az/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/az/Makefile
++#>- $(AUTOMAKE) --foreign translations/az/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -37967,11 +27886,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/az/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/az/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/az/Makefile
-+ $(AUTOMAKE) --foreign po/az/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/az/Makefile.in
+- $(AUTOMAKE) --gnu translations/az/messages/Makefile
++ $(AUTOMAKE) --foreign translations/az/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/az/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -37994,7 +27913,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -38009,7 +27928,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -38018,7 +27937,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -38033,7 +27952,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -38042,7 +27961,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -38057,7 +27976,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -38082,7 +28001,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -38098,7 +28017,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -38108,12 +28027,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -38122,7 +28041,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -38145,7 +28064,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -38153,7 +28072,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -38162,7 +28081,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -38171,7 +28090,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -38213,7 +28132,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -38221,7 +28140,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/az/Makefile
+- $(AUTOMAKE) --gnu translations/az/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -38230,19 +28149,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/az/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/az/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/az/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/az/Makefile.in
++ $(AUTOMAKE) --foreign translations/az/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/az/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/br/Makefile.in gwenview-1.2.0/po/br/Makefile.in
---- gwenview-1.2.0.orig/po/br/Makefile.in 2005-04-03 13:19:02.000000000 +0000
-+++ gwenview-1.2.0/po/br/Makefile.in 2005-07-26 19:28:12.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/br/Makefile.in gwenview-1.3.0/translations/br/Makefile.in
+--- gwenview-1.3.0.orig/translations/br/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/translations/br/Makefile.in 2005-09-12 08:43:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -38268,11 +28187,11 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/br
++subdir = translations/br
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -38302,21 +28221,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -38326,7 +28235,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -38335,78 +28244,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages
+-subdir = translations/br
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = br
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/br/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/br/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/br/Makefile
++#>+ 12
++ @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) --foreign translations/br/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/br/Makefile
++ $(AUTOMAKE) --foreign translations/br/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/br/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/br/Makefile
++ @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) --foreign translations/br/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/br/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/br/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/br/messages/Makefile.in gwenview-1.3.0/translations/br/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/br/messages/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/translations/br/messages/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/br/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/br
+-subdir = translations/br/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -38441,11 +28707,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/br/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/br/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/br/Makefile
+-#>- $(AUTOMAKE) --gnu translations/br/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/br/Makefile
++#>- $(AUTOMAKE) --foreign translations/br/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -38455,11 +28721,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/br/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/br/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/br/Makefile
-+ $(AUTOMAKE) --foreign po/br/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/br/Makefile.in
+- $(AUTOMAKE) --gnu translations/br/messages/Makefile
++ $(AUTOMAKE) --foreign translations/br/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/br/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -38482,7 +28748,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -38497,7 +28763,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -38506,7 +28772,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -38521,7 +28787,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -38530,7 +28796,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -38545,7 +28811,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -38570,7 +28836,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -38586,7 +28852,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -38596,12 +28862,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -38610,7 +28876,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -38633,7 +28899,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -38641,7 +28907,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -38650,7 +28916,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -38659,7 +28925,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -38701,7 +28967,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -38709,7 +28975,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/br/Makefile
+- $(AUTOMAKE) --gnu translations/br/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -38718,19 +28984,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/br/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/br/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/br/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/br/Makefile.in
++ $(AUTOMAKE) --foreign translations/br/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/br/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/ca/Makefile.in gwenview-1.2.0/po/ca/Makefile.in
---- gwenview-1.2.0.orig/po/ca/Makefile.in 2005-04-03 13:19:02.000000000 +0000
-+++ gwenview-1.2.0/po/ca/Makefile.in 2005-07-26 19:28:12.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/ca/Makefile.in gwenview-1.3.0/translations/ca/Makefile.in
+--- gwenview-1.3.0.orig/translations/ca/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/translations/ca/Makefile.in 2005-09-12 08:43:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -38756,11 +29022,11 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/ca
++subdir = translations/ca
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -38790,21 +29056,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -38814,7 +29070,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -38823,78 +29079,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages
+-subdir = translations/ca
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = ca
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ca/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/ca/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/ca/Makefile
++#>+ 12
++ @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) --foreign translations/ca/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/ca/Makefile
++ $(AUTOMAKE) --foreign translations/ca/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ca/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/ca/Makefile
++ @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) --foreign translations/ca/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/ca/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ca/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/ca/messages/Makefile.in gwenview-1.3.0/translations/ca/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/ca/messages/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/translations/ca/messages/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/ca/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/ca
+-subdir = translations/ca/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -38929,11 +29542,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ca/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ca/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/ca/Makefile
+-#>- $(AUTOMAKE) --gnu translations/ca/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/ca/Makefile
++#>- $(AUTOMAKE) --foreign translations/ca/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -38943,11 +29556,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ca/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ca/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/ca/Makefile
-+ $(AUTOMAKE) --foreign po/ca/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/ca/Makefile.in
+- $(AUTOMAKE) --gnu translations/ca/messages/Makefile
++ $(AUTOMAKE) --foreign translations/ca/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ca/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -38970,7 +29583,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -38985,7 +29598,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -38994,7 +29607,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -39009,7 +29622,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -39018,7 +29631,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -39033,7 +29646,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -39058,7 +29671,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -39074,7 +29687,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -39084,12 +29697,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -39098,7 +29711,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -39121,7 +29734,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -39129,7 +29742,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -39138,7 +29751,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -39147,7 +29760,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -39189,7 +29802,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -39197,7 +29810,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/ca/Makefile
+- $(AUTOMAKE) --gnu translations/ca/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -39206,19 +29819,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ca/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ca/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/ca/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/ca/Makefile.in
++ $(AUTOMAKE) --foreign translations/ca/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ca/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/cs/Makefile.in gwenview-1.2.0/po/cs/Makefile.in
---- gwenview-1.2.0.orig/po/cs/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/cs/Makefile.in 2005-07-26 19:28:13.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/cs/Makefile.in gwenview-1.3.0/translations/cs/Makefile.in
+--- gwenview-1.3.0.orig/translations/cs/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/translations/cs/Makefile.in 2005-09-12 08:43:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -39244,11 +29857,11 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/cs
++subdir = translations/cs
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -39278,21 +29891,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -39302,7 +29905,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -39311,78 +29914,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages
+-subdir = translations/cs
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = cs
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/cs/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/cs/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/cs/Makefile
++#>+ 12
++ @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) --foreign translations/cs/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/cs/Makefile
++ $(AUTOMAKE) --foreign translations/cs/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/cs/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/cs/Makefile
++ @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) --foreign translations/cs/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/cs/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/cs/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/cs/messages/Makefile.in gwenview-1.3.0/translations/cs/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/cs/messages/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/translations/cs/messages/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/cs/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/cs
+-subdir = translations/cs/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -39417,11 +30377,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/cs/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/cs/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/cs/Makefile
+-#>- $(AUTOMAKE) --gnu translations/cs/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/cs/Makefile
++#>- $(AUTOMAKE) --foreign translations/cs/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -39431,11 +30391,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/cs/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/cs/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/cs/Makefile
-+ $(AUTOMAKE) --foreign po/cs/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/cs/Makefile.in
+- $(AUTOMAKE) --gnu translations/cs/messages/Makefile
++ $(AUTOMAKE) --foreign translations/cs/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/cs/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -39458,7 +30418,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -39473,7 +30433,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -39482,7 +30442,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -39497,7 +30457,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -39506,7 +30466,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -39521,7 +30481,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -39546,7 +30506,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -39562,7 +30522,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -39572,12 +30532,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -39586,7 +30546,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -39609,7 +30569,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -39617,7 +30577,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -39626,7 +30586,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -39635,7 +30595,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -39677,7 +30637,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -39685,7 +30645,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/cs/Makefile
+- $(AUTOMAKE) --gnu translations/cs/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -39694,19 +30654,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/cs/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/cs/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/cs/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/cs/Makefile.in
++ $(AUTOMAKE) --foreign translations/cs/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/cs/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/cy/Makefile.in gwenview-1.2.0/po/cy/Makefile.in
---- gwenview-1.2.0.orig/po/cy/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/cy/Makefile.in 2005-07-26 19:28:13.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/cy/Makefile.in gwenview-1.3.0/translations/cy/Makefile.in
+--- gwenview-1.3.0.orig/translations/cy/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/translations/cy/Makefile.in 2005-09-12 08:43:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -39732,11 +30692,11 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/cy
++subdir = translations/cy
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -39766,21 +30726,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -39790,7 +30740,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -39799,78 +30749,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages
+-subdir = translations/cy
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = cy
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/cy/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/cy/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/cy/Makefile
++#>+ 12
++ @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) --foreign translations/cy/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/cy/Makefile
++ $(AUTOMAKE) --foreign translations/cy/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/cy/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/cy/Makefile
++ @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) --foreign translations/cy/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/cy/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/cy/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/cy/messages/Makefile.in gwenview-1.3.0/translations/cy/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/cy/messages/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/translations/cy/messages/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/cy/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/cy
+-subdir = translations/cy/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -39905,11 +31212,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/cy/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/cy/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/cy/Makefile
+-#>- $(AUTOMAKE) --gnu translations/cy/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/cy/Makefile
++#>- $(AUTOMAKE) --foreign translations/cy/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -39919,11 +31226,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/cy/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/cy/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/cy/Makefile
-+ $(AUTOMAKE) --foreign po/cy/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/cy/Makefile.in
+- $(AUTOMAKE) --gnu translations/cy/messages/Makefile
++ $(AUTOMAKE) --foreign translations/cy/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/cy/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -39946,7 +31253,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -39961,7 +31268,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -39970,7 +31277,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -39985,7 +31292,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -39994,7 +31301,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -40009,7 +31316,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -40034,7 +31341,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -40050,7 +31357,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -40060,12 +31367,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -40074,7 +31381,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -40097,7 +31404,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -40105,7 +31412,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -40114,7 +31421,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -40123,7 +31430,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -40165,7 +31472,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -40173,7 +31480,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/cy/Makefile
+- $(AUTOMAKE) --gnu translations/cy/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -40182,19 +31489,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/cy/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/cy/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/cy/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/cy/Makefile.in
++ $(AUTOMAKE) --foreign translations/cy/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/cy/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/da/Makefile.in gwenview-1.2.0/po/da/Makefile.in
---- gwenview-1.2.0.orig/po/da/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/da/Makefile.in 2005-07-26 19:28:13.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/da/doc/Makefile.in gwenview-1.3.0/translations/da/doc/Makefile.in
+--- gwenview-1.3.0.orig/translations/da/doc/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/translations/da/doc/Makefile.in 2005-09-12 08:43:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -40215,16 +31522,283 @@
@@ -22,7 +21,6 @@
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
+@@ -39,6 +37,21 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/da/doc
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +177,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +238,8 @@
+ 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@
+@@ -273,6 +291,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -299,27 +318,53 @@
+ xdg_menudir = @xdg_menudir@
+ KDE_LANG = da
+ KDE_DOCS = gwenview
+-subdir = translations/da/doc
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ #>- all: all-am
+ #>+ 1
+ all: docs-am all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/da/doc/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/da/doc/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/da/doc/Makefile
++#>+ 12
++ @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) --foreign translations/da/doc/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/da/doc/Makefile
++ $(AUTOMAKE) --foreign translations/da/doc/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/da/doc/Makefile.in
+-Makefile: $(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
+@@ -336,12 +381,6 @@
+ ctags: CTAGS
+ CTAGS:
+
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -357,7 +396,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -375,7 +414,6 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile
+-
+ installdirs:
+ install: install-am
+ install-exec: install-exec-am
+@@ -398,7 +436,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"
+@@ -419,6 +457,8 @@
+
+ dvi-am:
+
++html: html-am
++
+ info: info-am
+
+ info-am:
+@@ -455,10 +495,10 @@
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+- dvi-am info info-am install install-am install-data \
+- install-data-am install-exec install-exec-am install-info \
+- install-info-am install-man install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
++ dvi-am html html-am info info-am install install-am \
++ install-data install-data-am install-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
+@@ -468,10 +508,10 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=index.docbook keybindings.docbook mouse.docbook docked_windows.docbook Makefile.in introduction.docbook interface.docbook external_tools.docbook
++KDE_DIST=index.docbook keybindings.docbook mouse.docbook docked_windows.docbook Makefile.in introduction.docbook interface.docbook external_tools.docbook Makefile.am
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) external_tools.docbook interface.docbook introduction.docbook docked_windows.docbook keybindings.docbook index.docbook mouse.docbook
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) mouse.docbook external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook index.docbook keybindings.docbook
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -498,27 +538,36 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview
+- @for base in external_tools.docbook interface.docbook introduction.docbook docked_windows.docbook keybindings.docbook index.docbook mouse.docbook ; do \
++ @for base in mouse.docbook external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook index.docbook keybindings.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in external_tools.docbook interface.docbook introduction.docbook docked_windows.docbook keybindings.docbook index.docbook mouse.docbook ; do \
++ for base in mouse.docbook external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook index.docbook keybindings.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in external_tools.docbook interface.docbook introduction.docbook docked_windows.docbook keybindings.docbook index.docbook mouse.docbook ; do \
++ for file in mouse.docbook external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook index.docbook keybindings.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/da/doc/Makefile
++ @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) --foreign translations/da/doc/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/da/doc/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/da/doc/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/da/Makefile.in gwenview-1.3.0/translations/da/Makefile.in
+--- gwenview-1.3.0.orig/translations/da/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/translations/da/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/da
++subdir = translations/da
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -40254,21 +31828,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -40278,7 +31842,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -40287,78 +31851,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages doc
+-subdir = translations/da
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = da
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/da/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/da/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/da/Makefile
++#>+ 12
++ @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) --foreign translations/da/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/da/Makefile
++ $(AUTOMAKE) --foreign translations/da/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/da/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/da/Makefile
++ @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) --foreign translations/da/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/da/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/da/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/da/messages/Makefile.in gwenview-1.3.0/translations/da/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/da/messages/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/translations/da/messages/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/da/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/da
+-subdir = translations/da/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -40393,11 +32314,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/da/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/da/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/da/Makefile
+-#>- $(AUTOMAKE) --gnu translations/da/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/da/Makefile
++#>- $(AUTOMAKE) --foreign translations/da/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -40407,11 +32328,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/da/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/da/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/da/Makefile
-+ $(AUTOMAKE) --foreign po/da/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/da/Makefile.in
+- $(AUTOMAKE) --gnu translations/da/messages/Makefile
++ $(AUTOMAKE) --foreign translations/da/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/da/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -40434,7 +32355,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -40449,7 +32370,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -40458,7 +32379,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -40473,7 +32394,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -40482,7 +32403,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -40497,7 +32418,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -40522,7 +32443,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -40538,7 +32459,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -40548,12 +32469,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -40562,7 +32483,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -40585,7 +32506,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -40593,7 +32514,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -40602,7 +32523,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -40611,7 +32532,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -40653,7 +32574,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -40661,7 +32582,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/da/Makefile
+- $(AUTOMAKE) --gnu translations/da/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -40670,19 +32591,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/da/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/da/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/da/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/da/Makefile.in
++ $(AUTOMAKE) --foreign translations/da/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/da/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/de/Makefile.in gwenview-1.2.0/po/de/Makefile.in
---- gwenview-1.2.0.orig/po/de/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/de/Makefile.in 2005-07-26 19:28:13.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/de/doc/Makefile.in gwenview-1.3.0/translations/de/doc/Makefile.in
+--- gwenview-1.3.0.orig/translations/de/doc/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/translations/de/doc/Makefile.in 2005-09-12 08:43:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -40703,16 +32624,283 @@
@@ -22,7 +21,6 @@
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
+@@ -39,6 +37,21 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/de/doc
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +177,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +238,8 @@
+ 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@
+@@ -273,6 +291,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -299,27 +318,53 @@
+ xdg_menudir = @xdg_menudir@
+ KDE_LANG = de
+ KDE_DOCS = gwenview
+-subdir = translations/de/doc
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ #>- all: all-am
+ #>+ 1
+ all: docs-am all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/de/doc/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/de/doc/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/de/doc/Makefile
++#>+ 12
++ @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) --foreign translations/de/doc/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/de/doc/Makefile
++ $(AUTOMAKE) --foreign translations/de/doc/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/de/doc/Makefile.in
+-Makefile: $(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
+@@ -336,12 +381,6 @@
+ ctags: CTAGS
+ CTAGS:
+
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -357,7 +396,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -375,7 +414,6 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile
+-
+ installdirs:
+ install: install-am
+ install-exec: install-exec-am
+@@ -398,7 +436,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"
+@@ -419,6 +457,8 @@
+
+ dvi-am:
+
++html: html-am
++
+ info: info-am
+
+ info-am:
+@@ -455,10 +495,10 @@
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+- dvi-am info info-am install install-am install-data \
+- install-data-am install-exec install-exec-am install-info \
+- install-info-am install-man install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
++ dvi-am html html-am info info-am install install-am \
++ install-data install-data-am install-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
+@@ -468,10 +508,10 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=dock_grip.png index.docbook keybindings.docbook view_mode.png mouse.docbook docked_windows.docbook browse_mode.png Makefile.in external_tools_dialog.png introduction.docbook interface.docbook external_tools.docbook
++KDE_DIST=dock_grip.png index.docbook keybindings.docbook view_mode.png mouse.docbook docked_windows.docbook browse_mode.png Makefile.in external_tools_dialog.png introduction.docbook interface.docbook external_tools.docbook Makefile.am
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) external_tools.docbook interface.docbook introduction.docbook keybindings.docbook view_mode.png dock_grip.png docked_windows.docbook external_tools_dialog.png index.docbook mouse.docbook browse_mode.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) mouse.docbook browse_mode.png external_tools.docbook docked_windows.docbook introduction.docbook dock_grip.png interface.docbook view_mode.png index.docbook keybindings.docbook external_tools_dialog.png
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -498,27 +538,36 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview
+- @for base in external_tools.docbook interface.docbook introduction.docbook keybindings.docbook view_mode.png dock_grip.png docked_windows.docbook external_tools_dialog.png index.docbook mouse.docbook browse_mode.png ; do \
++ @for base in mouse.docbook browse_mode.png external_tools.docbook docked_windows.docbook introduction.docbook dock_grip.png interface.docbook view_mode.png index.docbook keybindings.docbook external_tools_dialog.png ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in external_tools.docbook interface.docbook introduction.docbook keybindings.docbook view_mode.png dock_grip.png docked_windows.docbook external_tools_dialog.png index.docbook mouse.docbook browse_mode.png ; do \
++ for base in mouse.docbook browse_mode.png external_tools.docbook docked_windows.docbook introduction.docbook dock_grip.png interface.docbook view_mode.png index.docbook keybindings.docbook external_tools_dialog.png ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in external_tools.docbook interface.docbook introduction.docbook keybindings.docbook view_mode.png dock_grip.png docked_windows.docbook external_tools_dialog.png index.docbook mouse.docbook browse_mode.png ; do \
++ for file in mouse.docbook browse_mode.png external_tools.docbook docked_windows.docbook introduction.docbook dock_grip.png interface.docbook view_mode.png index.docbook keybindings.docbook external_tools_dialog.png ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/de/doc/Makefile
++ @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) --foreign translations/de/doc/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/de/doc/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/de/doc/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/de/Makefile.in gwenview-1.3.0/translations/de/Makefile.in
+--- gwenview-1.3.0.orig/translations/de/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/translations/de/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/de
++subdir = translations/de
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -40742,21 +32930,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -40766,7 +32944,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -40775,78 +32953,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages doc
+-subdir = translations/de
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = de
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/de/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/de/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/de/Makefile
++#>+ 12
++ @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) --foreign translations/de/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/de/Makefile
++ $(AUTOMAKE) --foreign translations/de/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/de/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/de/Makefile
++ @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) --foreign translations/de/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/de/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/de/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/de/messages/Makefile.in gwenview-1.3.0/translations/de/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/de/messages/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/translations/de/messages/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/de/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/de
+-subdir = translations/de/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -40881,11 +33416,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/de/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/de/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/de/Makefile
+-#>- $(AUTOMAKE) --gnu translations/de/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/de/Makefile
++#>- $(AUTOMAKE) --foreign translations/de/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -40895,11 +33430,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/de/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/de/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/de/Makefile
-+ $(AUTOMAKE) --foreign po/de/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/de/Makefile.in
+- $(AUTOMAKE) --gnu translations/de/messages/Makefile
++ $(AUTOMAKE) --foreign translations/de/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/de/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -40922,7 +33457,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -40937,7 +33472,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -40946,7 +33481,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -40961,7 +33496,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -40970,7 +33505,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -40985,7 +33520,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -41010,7 +33545,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -41026,7 +33561,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -41036,12 +33571,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -41050,7 +33585,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -41073,7 +33608,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -41081,7 +33616,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -41090,7 +33625,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -41099,7 +33634,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -41141,7 +33676,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -41149,7 +33684,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/de/Makefile
+- $(AUTOMAKE) --gnu translations/de/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -41158,19 +33693,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/de/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/de/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/de/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/de/Makefile.in
++ $(AUTOMAKE) --foreign translations/de/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/de/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/el/Makefile.in gwenview-1.2.0/po/el/Makefile.in
---- gwenview-1.2.0.orig/po/el/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/el/Makefile.in 2005-07-26 19:28:13.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/el/Makefile.in gwenview-1.3.0/translations/el/Makefile.in
+--- gwenview-1.3.0.orig/translations/el/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/translations/el/Makefile.in 2005-09-12 08:43:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -41196,11 +33731,11 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/el
++subdir = translations/el
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -41230,21 +33765,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -41254,7 +33779,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -41263,78 +33788,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages
+-subdir = translations/el
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = el
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/el/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/el/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/el/Makefile
++#>+ 12
++ @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) --foreign translations/el/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/el/Makefile
++ $(AUTOMAKE) --foreign translations/el/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/el/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/el/Makefile
++ @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) --foreign translations/el/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/el/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/el/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/el/messages/Makefile.in gwenview-1.3.0/translations/el/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/el/messages/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/translations/el/messages/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/el/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/el
+-subdir = translations/el/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -41369,11 +34251,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/el/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/el/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/el/Makefile
+-#>- $(AUTOMAKE) --gnu translations/el/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/el/Makefile
++#>- $(AUTOMAKE) --foreign translations/el/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -41383,11 +34265,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/el/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/el/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/el/Makefile
-+ $(AUTOMAKE) --foreign po/el/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/el/Makefile.in
+- $(AUTOMAKE) --gnu translations/el/messages/Makefile
++ $(AUTOMAKE) --foreign translations/el/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/el/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -41410,7 +34292,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -41425,7 +34307,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -41434,7 +34316,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -41449,7 +34331,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -41458,7 +34340,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -41473,7 +34355,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -41498,7 +34380,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -41514,7 +34396,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -41524,12 +34406,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -41538,7 +34420,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -41561,7 +34443,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -41569,7 +34451,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -41578,7 +34460,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -41587,7 +34469,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -41629,7 +34511,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -41637,7 +34519,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/el/Makefile
+- $(AUTOMAKE) --gnu translations/el/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -41646,19 +34528,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/el/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/el/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/el/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/el/Makefile.in
++ $(AUTOMAKE) --foreign translations/el/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/el/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/en_GB/Makefile.in gwenview-1.2.0/po/en_GB/Makefile.in
---- gwenview-1.2.0.orig/po/en_GB/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/en_GB/Makefile.in 2005-07-26 19:28:13.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/en_GB/Makefile.in gwenview-1.3.0/translations/en_GB/Makefile.in
+--- gwenview-1.3.0.orig/translations/en_GB/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/translations/en_GB/Makefile.in 2005-09-12 08:43:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -41684,11 +34566,11 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/en_GB
++subdir = translations/en_GB
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -41718,21 +34600,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -41742,7 +34614,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -41751,78 +34623,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages
+-subdir = translations/en_GB
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = en_GB
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/en_GB/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/en_GB/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/en_GB/Makefile
++#>+ 12
++ @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) --foreign translations/en_GB/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/en_GB/Makefile
++ $(AUTOMAKE) --foreign translations/en_GB/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/en_GB/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/en_GB/Makefile
++ @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) --foreign translations/en_GB/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/en_GB/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/en_GB/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/en_GB/messages/Makefile.in gwenview-1.3.0/translations/en_GB/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/en_GB/messages/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/translations/en_GB/messages/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/en_GB/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/en_GB
+-subdir = translations/en_GB/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -41857,11 +35086,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/en_GB/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/en_GB/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/en_GB/Makefile
+-#>- $(AUTOMAKE) --gnu translations/en_GB/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/en_GB/Makefile
++#>- $(AUTOMAKE) --foreign translations/en_GB/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -41871,11 +35100,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/en_GB/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/en_GB/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/en_GB/Makefile
-+ $(AUTOMAKE) --foreign po/en_GB/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/en_GB/Makefile.in
+- $(AUTOMAKE) --gnu translations/en_GB/messages/Makefile
++ $(AUTOMAKE) --foreign translations/en_GB/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/en_GB/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -41898,7 +35127,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -41913,7 +35142,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -41922,7 +35151,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -41937,7 +35166,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -41946,7 +35175,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -41961,7 +35190,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -41986,7 +35215,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -42002,7 +35231,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -42012,12 +35241,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -42026,7 +35255,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -42049,7 +35278,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -42057,7 +35286,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -42066,7 +35295,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -42075,7 +35304,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -42117,7 +35346,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -42125,7 +35354,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/en_GB/Makefile
+- $(AUTOMAKE) --gnu translations/en_GB/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -42134,19 +35363,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/en_GB/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/en_GB/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/en_GB/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/en_GB/Makefile.in
++ $(AUTOMAKE) --foreign translations/en_GB/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/en_GB/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/es/Makefile.in gwenview-1.2.0/po/es/Makefile.in
---- gwenview-1.2.0.orig/po/es/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/es/Makefile.in 2005-07-26 19:28:13.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/es/Makefile.in gwenview-1.3.0/translations/es/Makefile.in
+--- gwenview-1.3.0.orig/translations/es/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/translations/es/Makefile.in 2005-09-12 08:43:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -42172,11 +35401,11 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/es
++subdir = translations/es
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -42206,21 +35435,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -42230,7 +35449,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -42239,78 +35458,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages
+-subdir = translations/es
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = es
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/es/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/es/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/es/Makefile
++#>+ 12
++ @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) --foreign translations/es/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/es/Makefile
++ $(AUTOMAKE) --foreign translations/es/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/es/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/es/Makefile
++ @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) --foreign translations/es/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/es/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/es/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/es/messages/Makefile.in gwenview-1.3.0/translations/es/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/es/messages/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/translations/es/messages/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/es/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/es
+-subdir = translations/es/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -42345,11 +35921,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/es/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/es/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/es/Makefile
+-#>- $(AUTOMAKE) --gnu translations/es/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/es/Makefile
++#>- $(AUTOMAKE) --foreign translations/es/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -42359,11 +35935,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/es/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/es/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/es/Makefile
-+ $(AUTOMAKE) --foreign po/es/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/es/Makefile.in
+- $(AUTOMAKE) --gnu translations/es/messages/Makefile
++ $(AUTOMAKE) --foreign translations/es/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/es/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -42386,7 +35962,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -42401,7 +35977,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -42410,7 +35986,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -42425,7 +36001,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -42434,7 +36010,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -42449,7 +36025,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -42474,7 +36050,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -42490,7 +36066,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -42500,12 +36076,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -42514,7 +36090,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -42537,7 +36113,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -42545,7 +36121,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -42554,7 +36130,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -42563,7 +36139,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -42605,7 +36181,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -42613,7 +36189,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/es/Makefile
+- $(AUTOMAKE) --gnu translations/es/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -42622,19 +36198,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/es/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/es/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/es/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/es/Makefile.in
++ $(AUTOMAKE) --foreign translations/es/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/es/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/et/Makefile.in gwenview-1.2.0/po/et/Makefile.in
---- gwenview-1.2.0.orig/po/et/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/et/Makefile.in 2005-07-26 19:28:13.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/et/doc/Makefile.in gwenview-1.3.0/translations/et/doc/Makefile.in
+--- gwenview-1.3.0.orig/translations/et/doc/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/translations/et/doc/Makefile.in 2005-09-12 08:43:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -42655,16 +36231,283 @@
@@ -22,7 +21,6 @@
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
+@@ -39,6 +37,21 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/et/doc
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +177,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +238,8 @@
+ 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@
+@@ -273,6 +291,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -299,27 +318,53 @@
+ xdg_menudir = @xdg_menudir@
+ KDE_LANG = et
+ KDE_DOCS = gwenview
+-subdir = translations/et/doc
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ #>- all: all-am
+ #>+ 1
+ all: docs-am all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/et/doc/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/et/doc/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/et/doc/Makefile
++#>+ 12
++ @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) --foreign translations/et/doc/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/et/doc/Makefile
++ $(AUTOMAKE) --foreign translations/et/doc/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/et/doc/Makefile.in
+-Makefile: $(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
+@@ -336,12 +381,6 @@
+ ctags: CTAGS
+ CTAGS:
+
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -357,7 +396,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -375,7 +414,6 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile
+-
+ installdirs:
+ install: install-am
+ install-exec: install-exec-am
+@@ -398,7 +436,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"
+@@ -419,6 +457,8 @@
+
+ dvi-am:
+
++html: html-am
++
+ info: info-am
+
+ info-am:
+@@ -455,10 +495,10 @@
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+- dvi-am info info-am install install-am install-data \
+- install-data-am install-exec install-exec-am install-info \
+- install-info-am install-man install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
++ dvi-am html html-am info info-am install install-am \
++ install-data install-data-am install-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
+@@ -468,10 +508,10 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=index.docbook keybindings.docbook mouse.docbook docked_windows.docbook Makefile.in introduction.docbook interface.docbook external_tools.docbook
++KDE_DIST=index.docbook keybindings.docbook mouse.docbook docked_windows.docbook Makefile.in introduction.docbook interface.docbook external_tools.docbook Makefile.am
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) external_tools.docbook interface.docbook introduction.docbook docked_windows.docbook keybindings.docbook index.docbook mouse.docbook
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) mouse.docbook external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook index.docbook keybindings.docbook
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -498,27 +538,36 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview
+- @for base in external_tools.docbook interface.docbook introduction.docbook docked_windows.docbook keybindings.docbook index.docbook mouse.docbook ; do \
++ @for base in mouse.docbook external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook index.docbook keybindings.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in external_tools.docbook interface.docbook introduction.docbook docked_windows.docbook keybindings.docbook index.docbook mouse.docbook ; do \
++ for base in mouse.docbook external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook index.docbook keybindings.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in external_tools.docbook interface.docbook introduction.docbook docked_windows.docbook keybindings.docbook index.docbook mouse.docbook ; do \
++ for file in mouse.docbook external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook index.docbook keybindings.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/et/doc/Makefile
++ @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) --foreign translations/et/doc/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/et/doc/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/et/doc/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/et/Makefile.in gwenview-1.3.0/translations/et/Makefile.in
+--- gwenview-1.3.0.orig/translations/et/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/translations/et/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/et
++subdir = translations/et
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -42694,21 +36537,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -42718,7 +36551,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -42727,78 +36560,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages doc
+-subdir = translations/et
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = et
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/et/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/et/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/et/Makefile
++#>+ 12
++ @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) --foreign translations/et/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/et/Makefile
++ $(AUTOMAKE) --foreign translations/et/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/et/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/et/Makefile
++ @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) --foreign translations/et/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/et/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/et/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/et/messages/Makefile.in gwenview-1.3.0/translations/et/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/et/messages/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/translations/et/messages/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/et/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/et
+-subdir = translations/et/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -42833,11 +37023,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/et/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/et/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/et/Makefile
+-#>- $(AUTOMAKE) --gnu translations/et/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/et/Makefile
++#>- $(AUTOMAKE) --foreign translations/et/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -42847,11 +37037,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/et/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/et/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/et/Makefile
-+ $(AUTOMAKE) --foreign po/et/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/et/Makefile.in
+- $(AUTOMAKE) --gnu translations/et/messages/Makefile
++ $(AUTOMAKE) --foreign translations/et/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/et/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -42874,7 +37064,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -42889,7 +37079,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -42898,7 +37088,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -42913,7 +37103,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -42922,7 +37112,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -42937,7 +37127,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -42962,7 +37152,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -42978,7 +37168,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -42988,12 +37178,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -43002,7 +37192,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -43025,7 +37215,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -43033,7 +37223,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -43042,7 +37232,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -43051,7 +37241,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -43093,7 +37283,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -43101,7 +37291,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/et/Makefile
+- $(AUTOMAKE) --gnu translations/et/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -43110,19 +37300,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/et/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/et/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/et/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/et/Makefile.in
++ $(AUTOMAKE) --foreign translations/et/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/et/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/fo/Makefile.in gwenview-1.2.0/po/fo/Makefile.in
---- gwenview-1.2.0.orig/po/fo/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/fo/Makefile.in 2005-07-26 19:28:13.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/fo/Makefile.in gwenview-1.3.0/translations/fo/Makefile.in
+--- gwenview-1.3.0.orig/translations/fo/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/translations/fo/Makefile.in 2005-09-12 08:43:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -43148,11 +37338,11 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/fo
++subdir = translations/fo
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -43182,21 +37372,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -43206,7 +37386,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -43215,78 +37395,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages
+-subdir = translations/fo
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = fo
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/fo/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/fo/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/fo/Makefile
++#>+ 12
++ @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) --foreign translations/fo/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/fo/Makefile
++ $(AUTOMAKE) --foreign translations/fo/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/fo/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/fo/Makefile
++ @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) --foreign translations/fo/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/fo/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/fo/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/fo/messages/Makefile.in gwenview-1.3.0/translations/fo/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/fo/messages/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/translations/fo/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/fo/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/fo
+-subdir = translations/fo/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -43321,11 +37858,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/fo/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/fo/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/fo/Makefile
+-#>- $(AUTOMAKE) --gnu translations/fo/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/fo/Makefile
++#>- $(AUTOMAKE) --foreign translations/fo/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -43335,11 +37872,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/fo/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/fo/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/fo/Makefile
-+ $(AUTOMAKE) --foreign po/fo/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/fo/Makefile.in
+- $(AUTOMAKE) --gnu translations/fo/messages/Makefile
++ $(AUTOMAKE) --foreign translations/fo/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/fo/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -43362,7 +37899,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -43377,7 +37914,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -43386,7 +37923,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -43401,7 +37938,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -43410,7 +37947,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -43425,7 +37962,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -43450,7 +37987,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -43466,7 +38003,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -43476,12 +38013,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -43490,7 +38027,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -43513,7 +38050,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -43521,7 +38058,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -43530,7 +38067,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -43539,7 +38076,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -43581,7 +38118,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -43589,7 +38126,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/fo/Makefile
+- $(AUTOMAKE) --gnu translations/fo/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -43598,19 +38135,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/fo/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/fo/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/fo/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/fo/Makefile.in
++ $(AUTOMAKE) --foreign translations/fo/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/fo/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/fr/Makefile.in gwenview-1.2.0/po/fr/Makefile.in
---- gwenview-1.2.0.orig/po/fr/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/fr/Makefile.in 2005-07-26 19:28:13.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/fr/doc/Makefile.in gwenview-1.3.0/translations/fr/doc/Makefile.in
+--- gwenview-1.3.0.orig/translations/fr/doc/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/translations/fr/doc/Makefile.in 2005-09-12 08:43:48.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -43631,16 +38168,259 @@
@@ -22,7 +21,6 @@
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
+@@ -39,6 +37,21 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/fr/doc
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +177,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +238,8 @@
+ 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@
+@@ -273,6 +291,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -299,27 +318,53 @@
+ xdg_menudir = @xdg_menudir@
+ KDE_LANG = fr
+ KDE_DOCS = gwenview
+-subdir = translations/fr/doc
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ #>- all: all-am
+ #>+ 1
+ all: docs-am all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/fr/doc/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/fr/doc/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/fr/doc/Makefile
++#>+ 12
++ @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) --foreign translations/fr/doc/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/fr/doc/Makefile
++ $(AUTOMAKE) --foreign translations/fr/doc/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/fr/doc/Makefile.in
+-Makefile: $(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
+@@ -336,12 +381,6 @@
+ ctags: CTAGS
+ CTAGS:
+
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -357,7 +396,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -375,7 +414,6 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile
+-
+ installdirs:
+ install: install-am
+ install-exec: install-exec-am
+@@ -398,7 +436,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"
+@@ -419,6 +457,8 @@
+
+ dvi-am:
+
++html: html-am
++
+ info: info-am
+
+ info-am:
+@@ -455,10 +495,10 @@
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+- dvi-am info info-am install install-am install-data \
+- install-data-am install-exec install-exec-am install-info \
+- install-info-am install-man install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
++ dvi-am html html-am info info-am install install-am \
++ install-data install-data-am install-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
+@@ -468,7 +508,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=index.docbook Makefile.in
++KDE_DIST=index.docbook Makefile.in Makefile.am
+
+ #>+ 24
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
+@@ -515,10 +555,19 @@
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/fr/doc/Makefile
++ @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) --foreign translations/fr/doc/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/fr/doc/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/fr/doc/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/fr/Makefile.in gwenview-1.3.0/translations/fr/Makefile.in
+--- gwenview-1.3.0.orig/translations/fr/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/translations/fr/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/fr
++subdir = translations/fr
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -43670,21 +38450,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -43694,7 +38464,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -43703,78 +38473,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages doc
+-subdir = translations/fr
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = fr
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/fr/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/fr/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/fr/Makefile
++#>+ 12
++ @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) --foreign translations/fr/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/fr/Makefile
++ $(AUTOMAKE) --foreign translations/fr/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/fr/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/fr/Makefile
++ @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) --foreign translations/fr/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/fr/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/fr/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/fr/messages/Makefile.in gwenview-1.3.0/translations/fr/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/fr/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/fr/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/fr/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/fr
+-subdir = translations/fr/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -43809,11 +38936,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/fr/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/fr/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/fr/Makefile
+-#>- $(AUTOMAKE) --gnu translations/fr/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/fr/Makefile
++#>- $(AUTOMAKE) --foreign translations/fr/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -43823,11 +38950,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/fr/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/fr/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/fr/Makefile
-+ $(AUTOMAKE) --foreign po/fr/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/fr/Makefile.in
+- $(AUTOMAKE) --gnu translations/fr/messages/Makefile
++ $(AUTOMAKE) --foreign translations/fr/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/fr/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -43850,7 +38977,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -43865,7 +38992,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -43874,7 +39001,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -43889,7 +39016,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -43898,7 +39025,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -43913,7 +39040,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -43938,7 +39065,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -43954,7 +39081,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -43964,12 +39091,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -43978,7 +39105,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -44001,7 +39128,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -44009,7 +39136,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -44018,7 +39145,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -44027,7 +39154,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -44069,7 +39196,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -44077,7 +39204,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/fr/Makefile
+- $(AUTOMAKE) --gnu translations/fr/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -44086,19 +39213,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/fr/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/fr/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/fr/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/fr/Makefile.in
++ $(AUTOMAKE) --foreign translations/fr/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/fr/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/ga/Makefile.in gwenview-1.2.0/po/ga/Makefile.in
---- gwenview-1.2.0.orig/po/ga/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/ga/Makefile.in 2005-07-26 19:28:13.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/ga/Makefile.in gwenview-1.3.0/translations/ga/Makefile.in
+--- gwenview-1.3.0.orig/translations/ga/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/ga/Makefile.in 2005-09-12 08:43:48.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -44124,11 +39251,11 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/ga
++subdir = translations/ga
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -44158,21 +39285,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -44182,7 +39299,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -44191,78 +39308,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages
+-subdir = translations/ga
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = ga
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ga/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/ga/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/ga/Makefile
++#>+ 12
++ @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) --foreign translations/ga/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/ga/Makefile
++ $(AUTOMAKE) --foreign translations/ga/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ga/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/ga/Makefile
++ @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) --foreign translations/ga/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/ga/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ga/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/ga/messages/Makefile.in gwenview-1.3.0/translations/ga/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/ga/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/ga/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/ga/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/ga
+-subdir = translations/ga/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -44297,11 +39771,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ga/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ga/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/ga/Makefile
+-#>- $(AUTOMAKE) --gnu translations/ga/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/ga/Makefile
++#>- $(AUTOMAKE) --foreign translations/ga/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -44311,11 +39785,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ga/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ga/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/ga/Makefile
-+ $(AUTOMAKE) --foreign po/ga/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/ga/Makefile.in
+- $(AUTOMAKE) --gnu translations/ga/messages/Makefile
++ $(AUTOMAKE) --foreign translations/ga/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ga/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -44338,7 +39812,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -44353,7 +39827,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -44362,7 +39836,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -44377,7 +39851,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -44386,7 +39860,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -44401,7 +39875,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -44426,7 +39900,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -44442,7 +39916,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -44452,12 +39926,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -44466,7 +39940,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -44489,7 +39963,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -44497,7 +39971,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -44506,7 +39980,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -44515,7 +39989,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -44557,7 +40031,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -44565,7 +40039,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/ga/Makefile
+- $(AUTOMAKE) --gnu translations/ga/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -44574,19 +40048,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ga/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ga/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/ga/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/ga/Makefile.in
++ $(AUTOMAKE) --foreign translations/ga/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ga/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/gl/Makefile.in gwenview-1.2.0/po/gl/Makefile.in
---- gwenview-1.2.0.orig/po/gl/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/gl/Makefile.in 2005-07-26 19:28:13.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/gl/Makefile.in gwenview-1.3.0/translations/gl/Makefile.in
+--- gwenview-1.3.0.orig/translations/gl/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/gl/Makefile.in 2005-09-12 08:43:48.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -44612,11 +40086,11 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/gl
++subdir = translations/gl
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -44646,21 +40120,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -44670,7 +40134,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -44679,78 +40143,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages
+-subdir = translations/gl
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = gl
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/gl/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/gl/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/gl/Makefile
++#>+ 12
++ @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) --foreign translations/gl/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/gl/Makefile
++ $(AUTOMAKE) --foreign translations/gl/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/gl/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/gl/Makefile
++ @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) --foreign translations/gl/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/gl/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/gl/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/gl/messages/Makefile.in gwenview-1.3.0/translations/gl/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/gl/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/gl/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/gl/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/gl
+-subdir = translations/gl/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -44785,11 +40606,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/gl/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/gl/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/gl/Makefile
+-#>- $(AUTOMAKE) --gnu translations/gl/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/gl/Makefile
++#>- $(AUTOMAKE) --foreign translations/gl/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -44799,11 +40620,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/gl/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/gl/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/gl/Makefile
-+ $(AUTOMAKE) --foreign po/gl/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/gl/Makefile.in
+- $(AUTOMAKE) --gnu translations/gl/messages/Makefile
++ $(AUTOMAKE) --foreign translations/gl/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/gl/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -44826,7 +40647,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -44841,7 +40662,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -44850,7 +40671,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -44865,7 +40686,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -44874,7 +40695,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -44889,7 +40710,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -44914,7 +40735,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -44930,7 +40751,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -44940,12 +40761,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -44954,7 +40775,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -44977,7 +40798,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -44985,7 +40806,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -44994,7 +40815,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -45003,7 +40824,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -45045,7 +40866,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -45053,7 +40874,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/gl/Makefile
+- $(AUTOMAKE) --gnu translations/gl/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -45062,19 +40883,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/gl/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/gl/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/gl/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/gl/Makefile.in
++ $(AUTOMAKE) --foreign translations/gl/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/gl/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/he/Makefile.in gwenview-1.2.0/po/he/Makefile.in
---- gwenview-1.2.0.orig/po/he/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/he/Makefile.in 2005-07-26 19:28:13.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/he/Makefile.in gwenview-1.3.0/translations/he/Makefile.in
+--- gwenview-1.3.0.orig/translations/he/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/he/Makefile.in 2005-09-12 08:43:48.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -45100,11 +40921,11 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/he
++subdir = translations/he
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -45134,21 +40955,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -45158,7 +40969,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -45167,78 +40978,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages
+-subdir = translations/he
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = he
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/he/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/he/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/he/Makefile
++#>+ 12
++ @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) --foreign translations/he/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/he/Makefile
++ $(AUTOMAKE) --foreign translations/he/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/he/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/he/Makefile
++ @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) --foreign translations/he/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/he/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/he/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/he/messages/Makefile.in gwenview-1.3.0/translations/he/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/he/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/he/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/he/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/he
+-subdir = translations/he/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -45273,11 +41441,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/he/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/he/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/he/Makefile
+-#>- $(AUTOMAKE) --gnu translations/he/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/he/Makefile
++#>- $(AUTOMAKE) --foreign translations/he/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -45287,11 +41455,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/he/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/he/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/he/Makefile
-+ $(AUTOMAKE) --foreign po/he/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/he/Makefile.in
+- $(AUTOMAKE) --gnu translations/he/messages/Makefile
++ $(AUTOMAKE) --foreign translations/he/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/he/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -45314,7 +41482,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -45329,7 +41497,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -45338,7 +41506,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -45353,7 +41521,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -45362,7 +41530,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -45377,7 +41545,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -45402,7 +41570,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -45418,7 +41586,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -45428,12 +41596,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -45442,7 +41610,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -45465,7 +41633,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -45473,7 +41641,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -45482,7 +41650,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -45491,7 +41659,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -45533,7 +41701,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -45541,7 +41709,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/he/Makefile
+- $(AUTOMAKE) --gnu translations/he/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -45550,19 +41718,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/he/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/he/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/he/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/he/Makefile.in
++ $(AUTOMAKE) --foreign translations/he/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/he/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/hi/Makefile.in gwenview-1.2.0/po/hi/Makefile.in
---- gwenview-1.2.0.orig/po/hi/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/hi/Makefile.in 2005-07-26 19:28:13.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/hi/Makefile.in gwenview-1.3.0/translations/hi/Makefile.in
+--- gwenview-1.3.0.orig/translations/hi/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/hi/Makefile.in 2005-09-12 08:43:48.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -45588,11 +41756,11 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/hi
++subdir = translations/hi
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -45622,21 +41790,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -45646,7 +41804,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -45655,78 +41813,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages
+-subdir = translations/hi
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = hi
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/hi/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/hi/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/hi/Makefile
++#>+ 12
++ @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) --foreign translations/hi/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/hi/Makefile
++ $(AUTOMAKE) --foreign translations/hi/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/hi/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/hi/Makefile
++ @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) --foreign translations/hi/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/hi/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/hi/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/hi/messages/Makefile.in gwenview-1.3.0/translations/hi/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/hi/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/hi/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/hi/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/hi
+-subdir = translations/hi/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -45761,11 +42276,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/hi/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/hi/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/hi/Makefile
+-#>- $(AUTOMAKE) --gnu translations/hi/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/hi/Makefile
++#>- $(AUTOMAKE) --foreign translations/hi/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -45775,11 +42290,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/hi/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/hi/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/hi/Makefile
-+ $(AUTOMAKE) --foreign po/hi/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/hi/Makefile.in
+- $(AUTOMAKE) --gnu translations/hi/messages/Makefile
++ $(AUTOMAKE) --foreign translations/hi/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/hi/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -45802,7 +42317,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -45817,7 +42332,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -45826,7 +42341,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -45841,7 +42356,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -45850,7 +42365,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -45865,7 +42380,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -45890,7 +42405,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -45906,7 +42421,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -45916,12 +42431,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -45930,7 +42445,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -45953,7 +42468,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -45961,7 +42476,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -45970,7 +42485,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -45979,7 +42494,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -46021,7 +42536,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -46029,7 +42544,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/hi/Makefile
+- $(AUTOMAKE) --gnu translations/hi/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -46038,19 +42553,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/hi/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/hi/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/hi/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/hi/Makefile.in
++ $(AUTOMAKE) --foreign translations/hi/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/hi/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/hu/Makefile.in gwenview-1.2.0/po/hu/Makefile.in
---- gwenview-1.2.0.orig/po/hu/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/hu/Makefile.in 2005-07-26 19:28:13.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/hu/Makefile.in gwenview-1.3.0/translations/hu/Makefile.in
+--- gwenview-1.3.0.orig/translations/hu/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/hu/Makefile.in 2005-09-12 08:43:48.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -46076,11 +42591,11 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/hu
++subdir = translations/hu
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -46110,21 +42625,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -46134,7 +42639,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -46143,78 +42648,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages
+-subdir = translations/hu
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = hu
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/hu/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/hu/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/hu/Makefile
++#>+ 12
++ @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) --foreign translations/hu/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/hu/Makefile
++ $(AUTOMAKE) --foreign translations/hu/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/hu/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/hu/Makefile
++ @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) --foreign translations/hu/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/hu/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/hu/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/hu/messages/Makefile.in gwenview-1.3.0/translations/hu/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/hu/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/hu/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/hu/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/hu
+-subdir = translations/hu/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -46249,11 +43111,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/hu/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/hu/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/hu/Makefile
+-#>- $(AUTOMAKE) --gnu translations/hu/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/hu/Makefile
++#>- $(AUTOMAKE) --foreign translations/hu/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -46263,11 +43125,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/hu/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/hu/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/hu/Makefile
-+ $(AUTOMAKE) --foreign po/hu/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/hu/Makefile.in
+- $(AUTOMAKE) --gnu translations/hu/messages/Makefile
++ $(AUTOMAKE) --foreign translations/hu/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/hu/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -46290,7 +43152,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -46305,7 +43167,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -46314,7 +43176,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -46329,7 +43191,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -46338,7 +43200,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -46353,7 +43215,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -46378,7 +43240,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -46394,7 +43256,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -46404,12 +43266,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -46418,7 +43280,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -46441,7 +43303,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -46449,7 +43311,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -46458,7 +43320,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -46467,7 +43329,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -46509,7 +43371,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -46517,7 +43379,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/hu/Makefile
+- $(AUTOMAKE) --gnu translations/hu/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -46526,19 +43388,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/hu/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/hu/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/hu/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/hu/Makefile.in
++ $(AUTOMAKE) --foreign translations/hu/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/hu/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/is/Makefile.in gwenview-1.2.0/po/is/Makefile.in
---- gwenview-1.2.0.orig/po/is/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/is/Makefile.in 2005-07-26 19:28:13.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/is/Makefile.in gwenview-1.3.0/translations/is/Makefile.in
+--- gwenview-1.3.0.orig/translations/is/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/is/Makefile.in 2005-09-12 08:43:48.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -46564,11 +43426,11 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/is
++subdir = translations/is
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -46598,21 +43460,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -46622,7 +43474,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -46631,78 +43483,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages
+-subdir = translations/is
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = is
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/is/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/is/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/is/Makefile
++#>+ 12
++ @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) --foreign translations/is/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/is/Makefile
++ $(AUTOMAKE) --foreign translations/is/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/is/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/is/Makefile
++ @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) --foreign translations/is/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/is/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/is/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/is/messages/Makefile.in gwenview-1.3.0/translations/is/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/is/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/is/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/is/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/is
+-subdir = translations/is/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -46737,11 +43946,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/is/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/is/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/is/Makefile
+-#>- $(AUTOMAKE) --gnu translations/is/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/is/Makefile
++#>- $(AUTOMAKE) --foreign translations/is/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -46751,11 +43960,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/is/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/is/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/is/Makefile
-+ $(AUTOMAKE) --foreign po/is/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/is/Makefile.in
+- $(AUTOMAKE) --gnu translations/is/messages/Makefile
++ $(AUTOMAKE) --foreign translations/is/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/is/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -46778,7 +43987,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -46793,7 +44002,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -46802,7 +44011,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -46817,7 +44026,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -46826,7 +44035,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -46841,7 +44050,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -46866,7 +44075,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -46882,7 +44091,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -46892,12 +44101,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -46906,7 +44115,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -46929,7 +44138,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -46937,7 +44146,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -46946,7 +44155,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -46955,7 +44164,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -46997,7 +44206,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -47005,7 +44214,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/is/Makefile
+- $(AUTOMAKE) --gnu translations/is/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -47014,19 +44223,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/is/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/is/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/is/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/is/Makefile.in
++ $(AUTOMAKE) --foreign translations/is/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/is/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/it/Makefile.in gwenview-1.2.0/po/it/Makefile.in
---- gwenview-1.2.0.orig/po/it/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/it/Makefile.in 2005-07-26 19:28:13.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/it/doc/Makefile.in gwenview-1.3.0/translations/it/doc/Makefile.in
+--- gwenview-1.3.0.orig/translations/it/doc/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/it/doc/Makefile.in 2005-09-12 08:43:48.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -47047,16 +44256,283 @@
@@ -22,7 +21,6 @@
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
+@@ -39,6 +37,21 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/it/doc
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +177,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +238,8 @@
+ 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@
+@@ -273,6 +291,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -299,27 +318,53 @@
+ xdg_menudir = @xdg_menudir@
+ KDE_LANG = it
+ KDE_DOCS = gwenview
+-subdir = translations/it/doc
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ #>- all: all-am
+ #>+ 1
+ all: docs-am all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/it/doc/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/it/doc/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/it/doc/Makefile
++#>+ 12
++ @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) --foreign translations/it/doc/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/it/doc/Makefile
++ $(AUTOMAKE) --foreign translations/it/doc/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/it/doc/Makefile.in
+-Makefile: $(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
+@@ -336,12 +381,6 @@
+ ctags: CTAGS
+ CTAGS:
+
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -357,7 +396,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -375,7 +414,6 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile
+-
+ installdirs:
+ install: install-am
+ install-exec: install-exec-am
+@@ -398,7 +436,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"
+@@ -419,6 +457,8 @@
+
+ dvi-am:
+
++html: html-am
++
+ info: info-am
+
+ info-am:
+@@ -455,10 +495,10 @@
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+- dvi-am info info-am install install-am install-data \
+- install-data-am install-exec install-exec-am install-info \
+- install-info-am install-man install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
++ dvi-am html html-am info info-am install install-am \
++ install-data install-data-am install-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
+@@ -468,10 +508,10 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=index.docbook keybindings.docbook view_mode.png mouse.docbook docked_windows.docbook browse_mode.png Makefile.in external_tools_dialog.png introduction.docbook interface.docbook external_tools.docbook
++KDE_DIST=index.docbook keybindings.docbook view_mode.png mouse.docbook docked_windows.docbook browse_mode.png Makefile.in external_tools_dialog.png introduction.docbook interface.docbook external_tools.docbook Makefile.am
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) external_tools.docbook interface.docbook introduction.docbook keybindings.docbook view_mode.png external_tools_dialog.png docked_windows.docbook index.docbook mouse.docbook browse_mode.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) mouse.docbook browse_mode.png external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook view_mode.png index.docbook keybindings.docbook external_tools_dialog.png
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -498,27 +538,36 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview
+- @for base in external_tools.docbook interface.docbook introduction.docbook keybindings.docbook view_mode.png external_tools_dialog.png docked_windows.docbook index.docbook mouse.docbook browse_mode.png ; do \
++ @for base in mouse.docbook browse_mode.png external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook view_mode.png index.docbook keybindings.docbook external_tools_dialog.png ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in external_tools.docbook interface.docbook introduction.docbook keybindings.docbook view_mode.png external_tools_dialog.png docked_windows.docbook index.docbook mouse.docbook browse_mode.png ; do \
++ for base in mouse.docbook browse_mode.png external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook view_mode.png index.docbook keybindings.docbook external_tools_dialog.png ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in external_tools.docbook interface.docbook introduction.docbook keybindings.docbook view_mode.png external_tools_dialog.png docked_windows.docbook index.docbook mouse.docbook browse_mode.png ; do \
++ for file in mouse.docbook browse_mode.png external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook view_mode.png index.docbook keybindings.docbook external_tools_dialog.png ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/it/doc/Makefile
++ @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) --foreign translations/it/doc/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/it/doc/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/it/doc/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/it/Makefile.in gwenview-1.3.0/translations/it/Makefile.in
+--- gwenview-1.3.0.orig/translations/it/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/it/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/it
++subdir = translations/it
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -47086,21 +44562,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -47110,7 +44576,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -47119,78 +44585,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages doc
+-subdir = translations/it
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = it
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/it/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/it/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/it/Makefile
++#>+ 12
++ @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) --foreign translations/it/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/it/Makefile
++ $(AUTOMAKE) --foreign translations/it/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/it/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/it/Makefile
++ @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) --foreign translations/it/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/it/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/it/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/it/messages/Makefile.in gwenview-1.3.0/translations/it/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/it/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/it/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/it/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/it
+-subdir = translations/it/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -47225,11 +45048,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/it/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/it/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/it/Makefile
+-#>- $(AUTOMAKE) --gnu translations/it/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/it/Makefile
++#>- $(AUTOMAKE) --foreign translations/it/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -47239,11 +45062,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/it/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/it/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/it/Makefile
-+ $(AUTOMAKE) --foreign po/it/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/it/Makefile.in
+- $(AUTOMAKE) --gnu translations/it/messages/Makefile
++ $(AUTOMAKE) --foreign translations/it/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/it/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -47266,7 +45089,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -47281,7 +45104,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -47290,7 +45113,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -47305,7 +45128,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -47314,7 +45137,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -47329,7 +45152,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -47354,7 +45177,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -47370,7 +45193,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -47380,12 +45203,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -47394,7 +45217,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -47417,7 +45240,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -47425,7 +45248,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -47434,7 +45257,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -47443,7 +45266,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -47485,7 +45308,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -47493,7 +45316,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/it/Makefile
+- $(AUTOMAKE) --gnu translations/it/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -47502,19 +45325,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/it/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/it/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/it/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/it/Makefile.in
++ $(AUTOMAKE) --foreign translations/it/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/it/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/ja/Makefile.in gwenview-1.2.0/po/ja/Makefile.in
---- gwenview-1.2.0.orig/po/ja/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/ja/Makefile.in 2005-07-26 19:28:13.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/ja/Makefile.in gwenview-1.3.0/translations/ja/Makefile.in
+--- gwenview-1.3.0.orig/translations/ja/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/ja/Makefile.in 2005-09-12 08:43:48.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -47540,11 +45363,11 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/ja
++subdir = translations/ja
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -47574,21 +45397,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -47598,7 +45411,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -47607,78 +45420,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages
+-subdir = translations/ja
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = ja
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ja/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/ja/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/ja/Makefile
++#>+ 12
++ @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) --foreign translations/ja/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/ja/Makefile
++ $(AUTOMAKE) --foreign translations/ja/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ja/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/ja/Makefile
++ @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) --foreign translations/ja/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/ja/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ja/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/ja/messages/Makefile.in gwenview-1.3.0/translations/ja/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/ja/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/ja/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/ja/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/ja
+-subdir = translations/ja/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -47713,11 +45883,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ja/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ja/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/ja/Makefile
+-#>- $(AUTOMAKE) --gnu translations/ja/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/ja/Makefile
++#>- $(AUTOMAKE) --foreign translations/ja/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -47727,11 +45897,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ja/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ja/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/ja/Makefile
-+ $(AUTOMAKE) --foreign po/ja/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/ja/Makefile.in
+- $(AUTOMAKE) --gnu translations/ja/messages/Makefile
++ $(AUTOMAKE) --foreign translations/ja/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ja/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -47754,7 +45924,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -47769,7 +45939,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -47778,7 +45948,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -47793,7 +45963,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -47802,7 +45972,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -47817,7 +45987,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -47842,7 +46012,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -47858,7 +46028,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -47868,12 +46038,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -47882,7 +46052,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -47905,7 +46075,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -47913,7 +46083,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -47922,7 +46092,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -47931,7 +46101,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -47973,7 +46143,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -47981,7 +46151,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/ja/Makefile
+- $(AUTOMAKE) --gnu translations/ja/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -47990,19 +46160,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ja/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ja/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/ja/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/ja/Makefile.in
++ $(AUTOMAKE) --foreign translations/ja/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ja/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/ko/Makefile.in gwenview-1.2.0/po/ko/Makefile.in
---- gwenview-1.2.0.orig/po/ko/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/ko/Makefile.in 2005-07-26 19:28:13.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/ko/Makefile.in gwenview-1.3.0/translations/ko/Makefile.in
+--- gwenview-1.3.0.orig/translations/ko/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/ko/Makefile.in 2005-09-12 08:43:48.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -48028,11 +46198,11 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/ko
++subdir = translations/ko
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -48062,21 +46232,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -48086,7 +46246,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -48095,78 +46255,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages
+-subdir = translations/ko
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = ko
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ko/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/ko/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/ko/Makefile
++#>+ 12
++ @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) --foreign translations/ko/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/ko/Makefile
++ $(AUTOMAKE) --foreign translations/ko/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ko/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/ko/Makefile
++ @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) --foreign translations/ko/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/ko/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ko/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/ko/messages/Makefile.in gwenview-1.3.0/translations/ko/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/ko/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/ko/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/ko/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/ko
+-subdir = translations/ko/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -48201,11 +46718,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ko/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ko/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/ko/Makefile
+-#>- $(AUTOMAKE) --gnu translations/ko/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/ko/Makefile
++#>- $(AUTOMAKE) --foreign translations/ko/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -48215,11 +46732,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ko/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ko/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/ko/Makefile
-+ $(AUTOMAKE) --foreign po/ko/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/ko/Makefile.in
+- $(AUTOMAKE) --gnu translations/ko/messages/Makefile
++ $(AUTOMAKE) --foreign translations/ko/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ko/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -48242,7 +46759,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -48257,7 +46774,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -48266,7 +46783,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -48281,7 +46798,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -48290,7 +46807,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -48305,7 +46822,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -48330,7 +46847,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -48346,7 +46863,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -48356,12 +46873,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -48370,7 +46887,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -48393,7 +46910,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -48401,7 +46918,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -48410,7 +46927,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -48419,7 +46936,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -48461,7 +46978,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -48469,7 +46986,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/ko/Makefile
+- $(AUTOMAKE) --gnu translations/ko/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -48478,19 +46995,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ko/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ko/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/ko/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/ko/Makefile.in
++ $(AUTOMAKE) --foreign translations/ko/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ko/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/lt/Makefile.in gwenview-1.2.0/po/lt/Makefile.in
---- gwenview-1.2.0.orig/po/lt/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/lt/Makefile.in 2005-07-26 19:28:13.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/lt/Makefile.in gwenview-1.3.0/translations/lt/Makefile.in
+--- gwenview-1.3.0.orig/translations/lt/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/lt/Makefile.in 2005-09-12 08:43:48.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -48516,11 +47033,11 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/lt
++subdir = translations/lt
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -48550,21 +47067,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -48574,7 +47081,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -48583,78 +47090,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages
+-subdir = translations/lt
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = lt
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/lt/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/lt/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/lt/Makefile
++#>+ 12
++ @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) --foreign translations/lt/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/lt/Makefile
++ $(AUTOMAKE) --foreign translations/lt/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/lt/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/lt/Makefile
++ @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) --foreign translations/lt/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/lt/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/lt/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/lt/messages/Makefile.in gwenview-1.3.0/translations/lt/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/lt/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/lt/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/lt/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/lt
+-subdir = translations/lt/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -48689,11 +47553,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/lt/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/lt/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/lt/Makefile
+-#>- $(AUTOMAKE) --gnu translations/lt/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/lt/Makefile
++#>- $(AUTOMAKE) --foreign translations/lt/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -48703,11 +47567,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/lt/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/lt/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/lt/Makefile
-+ $(AUTOMAKE) --foreign po/lt/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/lt/Makefile.in
+- $(AUTOMAKE) --gnu translations/lt/messages/Makefile
++ $(AUTOMAKE) --foreign translations/lt/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/lt/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -48730,7 +47594,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -48745,7 +47609,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -48754,7 +47618,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -48769,7 +47633,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -48778,7 +47642,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -48793,7 +47657,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -48818,7 +47682,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -48834,7 +47698,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -48844,12 +47708,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -48858,7 +47722,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -48881,7 +47745,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -48889,7 +47753,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -48898,7 +47762,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -48907,7 +47771,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -48949,7 +47813,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -48957,7 +47821,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/lt/Makefile
+- $(AUTOMAKE) --gnu translations/lt/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -48966,19 +47830,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/lt/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/lt/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/lt/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/lt/Makefile.in
++ $(AUTOMAKE) --foreign translations/lt/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/lt/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/Makefile.in gwenview-1.2.0/po/Makefile.in
---- gwenview-1.2.0.orig/po/Makefile.in 2005-04-03 13:19:02.000000000 +0000
-+++ gwenview-1.2.0/po/Makefile.in 2005-07-26 19:28:12.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/Makefile.in gwenview-1.3.0/translations/Makefile.in
+--- gwenview-1.3.0.orig/translations/Makefile.in 2005-09-11 10:40:30.000000000 -0400
++++ gwenview-1.3.0/translations/Makefile.in 2005-09-12 08:43:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -49008,7 +47872,7 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po
++subdir = translations
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -49042,15 +47906,7 @@
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +140,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +179,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -49060,7 +47916,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +238,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -49069,68 +47925,19 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +247,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +285,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -299,40 +309,53 @@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
- SUBDIRS = ar az br ca cs cy da de el en_GB es et fo fr ga gl he hi hu is it ja ko lt nb nl nso pl pt pt_BR ro ru sr sr at Latn sv ta tr uk ven xh xx zh_CN zh_TW zu
--subdir = po
+ SUBDIRS = ar az br ca cs cy da de el en_GB es et fo fr ga gl he hi hu is it ja ko lt nb nl nso pa pl pt pt_BR ro ru rw sr sr at Latn sv ta tr uk ven xh zh_CN zh_TW zu
+-subdir = translations
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -49165,11 +47972,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/Makefile
+-#>- $(AUTOMAKE) --gnu translations/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/Makefile
++#>- $(AUTOMAKE) --foreign translations/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -49179,11 +47986,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/Makefile
-+ $(AUTOMAKE) --foreign po/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/Makefile.in
+- $(AUTOMAKE) --gnu translations/Makefile
++ $(AUTOMAKE) --foreign translations/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -49206,7 +48013,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -351,7 +374,13 @@
+@@ -350,7 +398,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):
@@ -49221,7 +48028,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -363,7 +392,7 @@
+@@ -362,7 +416,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -49230,7 +48037,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -371,7 +400,13 @@
+@@ -370,7 +424,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -49245,7 +48052,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -392,7 +427,7 @@
+@@ -391,7 +451,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -49254,7 +48061,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -403,14 +438,6 @@
+@@ -402,14 +462,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -49269,7 +48076,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -419,19 +446,22 @@
+@@ -418,19 +470,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -49294,7 +48101,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -441,10 +471,11 @@
+@@ -440,10 +495,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -49310,7 +48117,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -467,12 +498,6 @@
+@@ -466,12 +522,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -49323,7 +48130,7 @@
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -486,7 +511,7 @@
+@@ -485,7 +535,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -49332,7 +48139,7 @@
else \
dir=''; \
fi; \
-@@ -501,15 +526,17 @@
+@@ -500,15 +550,17 @@
|| exit 1; \
fi; \
done
@@ -49355,7 +48162,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -519,7 +546,6 @@
+@@ -518,7 +570,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -49363,7 +48170,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -539,7 +565,7 @@
+@@ -538,7 +589,7 @@
clean-generic:
distclean-generic:
@@ -49372,7 +48179,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -561,6 +587,8 @@
+@@ -560,6 +611,8 @@
dvi-am:
@@ -49381,7 +48188,7 @@
info: info-recursive
info-am:
-@@ -595,37 +623,42 @@
+@@ -594,37 +647,42 @@
uninstall-info: uninstall-info-recursive
@@ -49428,7 +48235,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/Makefile
+- $(AUTOMAKE) --gnu translations/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -49437,19 +48244,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/Makefile.in
++ $(AUTOMAKE) --foreign translations/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/nb/Makefile.in gwenview-1.2.0/po/nb/Makefile.in
---- gwenview-1.2.0.orig/po/nb/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/nb/Makefile.in 2005-07-26 19:28:13.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/nb/Makefile.in gwenview-1.3.0/translations/nb/Makefile.in
+--- gwenview-1.3.0.orig/translations/nb/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/nb/Makefile.in 2005-09-12 08:43:48.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -49475,11 +48282,11 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/nb
++subdir = translations/nb
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -49509,21 +48316,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -49533,7 +48330,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -49542,78 +48339,19 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
--
- KDE_LANG = nb
- #>- SUBDIRS = $(AUTODIRS)
- #>+ 1
- SUBDIRS =.
--
- #>- POFILES = AUTO
- #>+ 2
- POFILES = gwenview.po
- GMOFILES = gwenview.gmo
--subdir = po/nb
+ SUBDIRS = messages
+-subdir = translations/nb
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -49635,7 +48373,7 @@
-DIST_SUBDIRS = $(SUBDIRS)
#>- all: all-recursive
#>+ 1
- all: all-nls docs-am all-recursive
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
@@ -49648,11 +48386,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nb/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/nb/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/nb/Makefile
+-#>- $(AUTOMAKE) --gnu translations/nb/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/nb/Makefile
++#>- $(AUTOMAKE) --foreign translations/nb/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -49662,11 +48400,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nb/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/nb/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/nb/Makefile
-+ $(AUTOMAKE) --foreign po/nb/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/nb/Makefile.in
+- $(AUTOMAKE) --gnu translations/nb/Makefile
++ $(AUTOMAKE) --foreign translations/nb/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/nb/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -49689,7 +48427,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -350,7 +398,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):
@@ -49704,7 +48442,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -362,7 +416,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -49713,7 +48451,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -370,7 +424,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -49728,7 +48466,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -391,7 +451,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -49737,7 +48475,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -402,14 +462,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -49752,7 +48490,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -418,19 +470,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -49777,7 +48515,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -440,10 +495,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -49793,22 +48531,20 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -466,12 +522,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -499,7 +522,7 @@
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -49817,7 +48553,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -500,15 +550,17 @@
|| exit 1; \
fi; \
done
@@ -49840,7 +48576,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -518,7 +570,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -49848,7 +48584,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -538,7 +589,7 @@
clean-generic:
distclean-generic:
@@ -49857,7 +48593,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -560,6 +611,8 @@
dvi-am:
@@ -49866,7 +48602,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -594,37 +647,42 @@
uninstall-info: uninstall-info-recursive
@@ -49903,12 +48639,9 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=gwenview.po Makefile.in
-+KDE_DIST=gwenview.po Makefile.in Makefile.am
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
- #>+ 4
- gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
#>+ 2
docs-am:
@@ -49916,7 +48649,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/nb/Makefile
+- $(AUTOMAKE) --gnu translations/nb/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -49925,19 +48658,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nb/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/nb/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/nb/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/nb/Makefile.in
++ $(AUTOMAKE) --foreign translations/nb/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/nb/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/nl/Makefile.in gwenview-1.2.0/po/nl/Makefile.in
---- gwenview-1.2.0.orig/po/nl/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/nl/Makefile.in 2005-07-26 19:28:13.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/nb/messages/Makefile.in gwenview-1.3.0/translations/nb/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/nb/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/nb/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -49958,7 +48691,7 @@
@@ -22,7 +21,6 @@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
+ top_builddir = ../../..
-
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
@@ -49967,7 +48700,7 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/nl
++subdir = translations/nb/messages
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -50003,15 +48736,7 @@
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +195,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -50021,7 +48746,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +256,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -50030,78 +48755,19 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
--
- KDE_LANG = nl
- #>- SUBDIRS = $(AUTODIRS)
- #>+ 1
- SUBDIRS =.
--
- #>- POFILES = AUTO
+@@ -305,40 +342,53 @@
#>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/nl
+-subdir = translations/nb/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -50136,11 +48802,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nl/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/nb/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/nl/Makefile
+-#>- $(AUTOMAKE) --gnu translations/nb/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/nl/Makefile
++#>- $(AUTOMAKE) --foreign translations/nb/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -50150,11 +48816,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nl/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/nb/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/nl/Makefile
-+ $(AUTOMAKE) --foreign po/nl/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/nl/Makefile.in
+- $(AUTOMAKE) --gnu translations/nb/messages/Makefile
++ $(AUTOMAKE) --foreign translations/nb/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/nb/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -50177,7 +48843,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -50192,7 +48858,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -50201,7 +48867,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -50216,7 +48882,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -50225,7 +48891,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -50240,7 +48906,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -50265,7 +48931,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -50281,7 +48947,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -50291,12 +48957,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -50305,7 +48971,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -50328,7 +48994,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -50336,7 +49002,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -50345,7 +49011,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -50354,7 +49020,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -50396,7 +49062,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -50404,7 +49070,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/nl/Makefile
+- $(AUTOMAKE) --gnu translations/nb/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -50413,19 +49079,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nl/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/nb/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/nl/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/nl/Makefile.in
++ $(AUTOMAKE) --foreign translations/nb/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/nb/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/nso/Makefile.in gwenview-1.2.0/po/nso/Makefile.in
---- gwenview-1.2.0.orig/po/nso/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/nso/Makefile.in 2005-07-26 19:28:13.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/nl/doc/Makefile.in gwenview-1.3.0/translations/nl/doc/Makefile.in
+--- gwenview-1.3.0.orig/translations/nl/doc/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/nl/doc/Makefile.in 2005-09-12 08:43:48.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -50446,16 +49112,283 @@
@@ -22,7 +21,6 @@
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
+@@ -39,6 +37,21 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/nl/doc
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +177,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +238,8 @@
+ 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@
+@@ -273,6 +291,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -299,27 +318,53 @@
+ xdg_menudir = @xdg_menudir@
+ KDE_LANG = nl
+ KDE_DOCS = gwenview
+-subdir = translations/nl/doc
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ #>- all: all-am
+ #>+ 1
+ all: docs-am all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/nl/doc/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/nl/doc/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/nl/doc/Makefile
++#>+ 12
++ @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) --foreign translations/nl/doc/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/nl/doc/Makefile
++ $(AUTOMAKE) --foreign translations/nl/doc/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/nl/doc/Makefile.in
+-Makefile: $(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
+@@ -336,12 +381,6 @@
+ ctags: CTAGS
+ CTAGS:
+
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -357,7 +396,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -375,7 +414,6 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile
+-
+ installdirs:
+ install: install-am
+ install-exec: install-exec-am
+@@ -398,7 +436,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"
+@@ -419,6 +457,8 @@
+
+ dvi-am:
+
++html: html-am
++
+ info: info-am
+
+ info-am:
+@@ -455,10 +495,10 @@
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+- dvi-am info info-am install install-am install-data \
+- install-data-am install-exec install-exec-am install-info \
+- install-info-am install-man install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
++ dvi-am html html-am info info-am install install-am \
++ install-data install-data-am install-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
+@@ -468,10 +508,10 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=index.docbook keybindings.docbook view_mode.png mouse.docbook docked_windows.docbook browse_mode.png Makefile.in external_tools_dialog.png introduction.docbook interface.docbook external_tools.docbook
++KDE_DIST=index.docbook keybindings.docbook view_mode.png mouse.docbook docked_windows.docbook browse_mode.png Makefile.in external_tools_dialog.png introduction.docbook interface.docbook external_tools.docbook Makefile.am
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) external_tools.docbook interface.docbook introduction.docbook keybindings.docbook view_mode.png external_tools_dialog.png docked_windows.docbook index.docbook mouse.docbook browse_mode.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) mouse.docbook browse_mode.png external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook view_mode.png index.docbook keybindings.docbook external_tools_dialog.png
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -498,27 +538,36 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview
+- @for base in external_tools.docbook interface.docbook introduction.docbook keybindings.docbook view_mode.png external_tools_dialog.png docked_windows.docbook index.docbook mouse.docbook browse_mode.png ; do \
++ @for base in mouse.docbook browse_mode.png external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook view_mode.png index.docbook keybindings.docbook external_tools_dialog.png ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in external_tools.docbook interface.docbook introduction.docbook keybindings.docbook view_mode.png external_tools_dialog.png docked_windows.docbook index.docbook mouse.docbook browse_mode.png ; do \
++ for base in mouse.docbook browse_mode.png external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook view_mode.png index.docbook keybindings.docbook external_tools_dialog.png ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in external_tools.docbook interface.docbook introduction.docbook keybindings.docbook view_mode.png external_tools_dialog.png docked_windows.docbook index.docbook mouse.docbook browse_mode.png ; do \
++ for file in mouse.docbook browse_mode.png external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook view_mode.png index.docbook keybindings.docbook external_tools_dialog.png ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/nl/doc/Makefile
++ @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) --foreign translations/nl/doc/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/nl/doc/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/nl/doc/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/nl/Makefile.in gwenview-1.3.0/translations/nl/Makefile.in
+--- gwenview-1.3.0.orig/translations/nl/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/nl/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/nso
++subdir = translations/nl
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -50485,21 +49418,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -50509,7 +49432,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -50518,78 +49441,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages doc
+-subdir = translations/nl
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = nso
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/nl/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/nl/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/nl/Makefile
++#>+ 12
++ @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) --foreign translations/nl/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/nl/Makefile
++ $(AUTOMAKE) --foreign translations/nl/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/nl/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/nl/Makefile
++ @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) --foreign translations/nl/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/nl/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/nl/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/nl/messages/Makefile.in gwenview-1.3.0/translations/nl/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/nl/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/nl/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/nl/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/nso
+-subdir = translations/nl/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -50624,11 +49904,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nso/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/nl/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/nso/Makefile
+-#>- $(AUTOMAKE) --gnu translations/nl/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/nso/Makefile
++#>- $(AUTOMAKE) --foreign translations/nl/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -50638,11 +49918,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nso/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/nl/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/nso/Makefile
-+ $(AUTOMAKE) --foreign po/nso/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/nso/Makefile.in
+- $(AUTOMAKE) --gnu translations/nl/messages/Makefile
++ $(AUTOMAKE) --foreign translations/nl/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/nl/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -50665,7 +49945,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -50680,7 +49960,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -50689,7 +49969,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -50704,7 +49984,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -50713,7 +49993,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -50728,7 +50008,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -50753,7 +50033,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -50769,7 +50049,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -50779,12 +50059,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -50793,7 +50073,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -50816,7 +50096,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -50824,7 +50104,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -50833,7 +50113,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -50842,7 +50122,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -50884,7 +50164,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -50892,7 +50172,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/nso/Makefile
+- $(AUTOMAKE) --gnu translations/nl/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -50901,19 +50181,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nso/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/nl/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/nso/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/nso/Makefile.in
++ $(AUTOMAKE) --foreign translations/nl/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/nl/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/pl/Makefile.in gwenview-1.2.0/po/pl/Makefile.in
---- gwenview-1.2.0.orig/po/pl/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/pl/Makefile.in 2005-07-26 19:28:13.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/nso/Makefile.in gwenview-1.3.0/translations/nso/Makefile.in
+--- gwenview-1.3.0.orig/translations/nso/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/nso/Makefile.in 2005-09-12 08:43:48.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -50939,11 +50219,11 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/pl
++subdir = translations/nso
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -50973,21 +50253,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -50997,7 +50267,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -51006,78 +50276,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages
+-subdir = translations/nso
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = pl
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/nso/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/nso/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/nso/Makefile
++#>+ 12
++ @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) --foreign translations/nso/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/nso/Makefile
++ $(AUTOMAKE) --foreign translations/nso/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/nso/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/nso/Makefile
++ @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) --foreign translations/nso/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/nso/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/nso/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/nso/messages/Makefile.in gwenview-1.3.0/translations/nso/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/nso/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/nso/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/nso/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/pl
+-subdir = translations/nso/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -51112,11 +50739,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pl/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/nso/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/pl/Makefile
+-#>- $(AUTOMAKE) --gnu translations/nso/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/pl/Makefile
++#>- $(AUTOMAKE) --foreign translations/nso/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -51126,11 +50753,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pl/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/nso/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/pl/Makefile
-+ $(AUTOMAKE) --foreign po/pl/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/pl/Makefile.in
+- $(AUTOMAKE) --gnu translations/nso/messages/Makefile
++ $(AUTOMAKE) --foreign translations/nso/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/nso/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -51153,7 +50780,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -51168,7 +50795,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -51177,7 +50804,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -51192,7 +50819,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -51201,7 +50828,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -51216,7 +50843,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -51241,7 +50868,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -51257,7 +50884,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -51267,12 +50894,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -51281,7 +50908,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -51304,7 +50931,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -51312,7 +50939,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -51321,7 +50948,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -51330,7 +50957,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -51372,7 +50999,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -51380,7 +51007,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/pl/Makefile
+- $(AUTOMAKE) --gnu translations/nso/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -51389,19 +51016,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pl/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/nso/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/pl/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/pl/Makefile.in
++ $(AUTOMAKE) --foreign translations/nso/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/nso/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/pt/Makefile.in gwenview-1.2.0/po/pt/Makefile.in
---- gwenview-1.2.0.orig/po/pt/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/pt/Makefile.in 2005-07-26 19:28:13.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/pa/Makefile.in gwenview-1.3.0/translations/pa/Makefile.in
+--- gwenview-1.3.0.orig/translations/pa/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/pa/Makefile.in 2005-09-12 08:43:48.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -51427,11 +51054,11 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/pt
++subdir = translations/pa
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -51461,21 +51088,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -51485,7 +51102,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -51494,78 +51111,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages
+-subdir = translations/pa
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = pt
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/pa/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/pa/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/pa/Makefile
++#>+ 12
++ @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) --foreign translations/pa/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/pa/Makefile
++ $(AUTOMAKE) --foreign translations/pa/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/pa/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/pa/Makefile
++ @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) --foreign translations/pa/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/pa/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/pa/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/pa/messages/Makefile.in gwenview-1.3.0/translations/pa/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/pa/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/pa/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/pa/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/pt
+-subdir = translations/pa/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -51600,11 +51574,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pt/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/pa/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/pt/Makefile
+-#>- $(AUTOMAKE) --gnu translations/pa/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/pt/Makefile
++#>- $(AUTOMAKE) --foreign translations/pa/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -51614,11 +51588,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pt/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/pa/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/pt/Makefile
-+ $(AUTOMAKE) --foreign po/pt/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/pt/Makefile.in
+- $(AUTOMAKE) --gnu translations/pa/messages/Makefile
++ $(AUTOMAKE) --foreign translations/pa/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/pa/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -51641,7 +51615,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -51656,7 +51630,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -51665,7 +51639,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -51680,7 +51654,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -51689,7 +51663,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -51704,7 +51678,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -51729,7 +51703,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -51745,7 +51719,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -51755,12 +51729,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -51769,7 +51743,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -51792,7 +51766,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -51800,7 +51774,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -51809,7 +51783,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -51818,7 +51792,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -51860,7 +51834,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -51868,7 +51842,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/pt/Makefile
+- $(AUTOMAKE) --gnu translations/pa/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -51877,19 +51851,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pt/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/pa/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/pt/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/pt/Makefile.in
++ $(AUTOMAKE) --foreign translations/pa/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/pa/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/pt_BR/Makefile.in gwenview-1.2.0/po/pt_BR/Makefile.in
---- gwenview-1.2.0.orig/po/pt_BR/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/pt_BR/Makefile.in 2005-07-26 19:28:13.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/pl/Makefile.in gwenview-1.3.0/translations/pl/Makefile.in
+--- gwenview-1.3.0.orig/translations/pl/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/pl/Makefile.in 2005-09-12 08:43:48.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -51915,11 +51889,11 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/pt_BR
++subdir = translations/pl
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -51949,21 +51923,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -51973,7 +51937,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -51982,78 +51946,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages
+-subdir = translations/pl
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = pt_BR
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/pl/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/pl/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/pl/Makefile
++#>+ 12
++ @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) --foreign translations/pl/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/pl/Makefile
++ $(AUTOMAKE) --foreign translations/pl/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/pl/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/pl/Makefile
++ @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) --foreign translations/pl/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/pl/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/pl/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/pl/messages/Makefile.in gwenview-1.3.0/translations/pl/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/pl/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/pl/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/pl/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/pt_BR
+-subdir = translations/pl/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -52088,11 +52409,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pt_BR/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/pl/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/pt_BR/Makefile
+-#>- $(AUTOMAKE) --gnu translations/pl/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/pt_BR/Makefile
++#>- $(AUTOMAKE) --foreign translations/pl/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -52102,11 +52423,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pt_BR/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/pl/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/pt_BR/Makefile
-+ $(AUTOMAKE) --foreign po/pt_BR/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/pt_BR/Makefile.in
+- $(AUTOMAKE) --gnu translations/pl/messages/Makefile
++ $(AUTOMAKE) --foreign translations/pl/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/pl/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -52129,7 +52450,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -52144,7 +52465,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -52153,7 +52474,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -52168,7 +52489,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -52177,7 +52498,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -52192,7 +52513,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -52217,7 +52538,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -52233,7 +52554,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -52243,12 +52564,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -52257,7 +52578,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -52280,7 +52601,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -52288,7 +52609,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -52297,7 +52618,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -52306,7 +52627,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -52348,7 +52669,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -52356,7 +52677,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/pt_BR/Makefile
+- $(AUTOMAKE) --gnu translations/pl/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -52365,19 +52686,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pt_BR/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/pl/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/pt_BR/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/pt_BR/Makefile.in
++ $(AUTOMAKE) --foreign translations/pl/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/pl/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/ro/Makefile.in gwenview-1.2.0/po/ro/Makefile.in
---- gwenview-1.2.0.orig/po/ro/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/ro/Makefile.in 2005-07-26 19:28:13.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/pt/doc/Makefile.in gwenview-1.3.0/translations/pt/doc/Makefile.in
+--- gwenview-1.3.0.orig/translations/pt/doc/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/pt/doc/Makefile.in 2005-09-12 08:43:48.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -52398,16 +52719,283 @@
@@ -22,7 +21,6 @@
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
+@@ -39,6 +37,21 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/pt/doc
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +177,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +238,8 @@
+ 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@
+@@ -273,6 +291,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -299,27 +318,53 @@
+ xdg_menudir = @xdg_menudir@
+ KDE_LANG = pt
+ KDE_DOCS = gwenview
+-subdir = translations/pt/doc
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ #>- all: all-am
+ #>+ 1
+ all: docs-am all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/pt/doc/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/pt/doc/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/pt/doc/Makefile
++#>+ 12
++ @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) --foreign translations/pt/doc/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/pt/doc/Makefile
++ $(AUTOMAKE) --foreign translations/pt/doc/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/pt/doc/Makefile.in
+-Makefile: $(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
+@@ -336,12 +381,6 @@
+ ctags: CTAGS
+ CTAGS:
+
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -357,7 +396,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -375,7 +414,6 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile
+-
+ installdirs:
+ install: install-am
+ install-exec: install-exec-am
+@@ -398,7 +436,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"
+@@ -419,6 +457,8 @@
+
+ dvi-am:
+
++html: html-am
++
+ info: info-am
+
+ info-am:
+@@ -455,10 +495,10 @@
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+- dvi-am info info-am install install-am install-data \
+- install-data-am install-exec install-exec-am install-info \
+- install-info-am install-man install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
++ dvi-am html html-am info info-am install install-am \
++ install-data install-data-am install-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
+@@ -468,10 +508,10 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=index.docbook keybindings.docbook mouse.docbook docked_windows.docbook Makefile.in introduction.docbook interface.docbook external_tools.docbook
++KDE_DIST=index.docbook keybindings.docbook mouse.docbook docked_windows.docbook Makefile.in introduction.docbook interface.docbook external_tools.docbook Makefile.am
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) external_tools.docbook interface.docbook introduction.docbook docked_windows.docbook keybindings.docbook index.docbook mouse.docbook
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) mouse.docbook external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook index.docbook keybindings.docbook
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -498,27 +538,36 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview
+- @for base in external_tools.docbook interface.docbook introduction.docbook docked_windows.docbook keybindings.docbook index.docbook mouse.docbook ; do \
++ @for base in mouse.docbook external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook index.docbook keybindings.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in external_tools.docbook interface.docbook introduction.docbook docked_windows.docbook keybindings.docbook index.docbook mouse.docbook ; do \
++ for base in mouse.docbook external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook index.docbook keybindings.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in external_tools.docbook interface.docbook introduction.docbook docked_windows.docbook keybindings.docbook index.docbook mouse.docbook ; do \
++ for file in mouse.docbook external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook index.docbook keybindings.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/pt/doc/Makefile
++ @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) --foreign translations/pt/doc/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/pt/doc/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/pt/doc/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/pt/Makefile.in gwenview-1.3.0/translations/pt/Makefile.in
+--- gwenview-1.3.0.orig/translations/pt/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/pt/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/ro
++subdir = translations/pt
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -52437,21 +53025,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -52461,7 +53039,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -52470,78 +53048,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages doc
+-subdir = translations/pt
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = ro
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/pt/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/pt/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/pt/Makefile
++#>+ 12
++ @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) --foreign translations/pt/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/pt/Makefile
++ $(AUTOMAKE) --foreign translations/pt/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/pt/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/pt/Makefile
++ @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) --foreign translations/pt/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/pt/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/pt/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/pt/messages/Makefile.in gwenview-1.3.0/translations/pt/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/pt/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/pt/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/pt/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/ro
+-subdir = translations/pt/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -52576,11 +53511,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ro/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/pt/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/ro/Makefile
+-#>- $(AUTOMAKE) --gnu translations/pt/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/ro/Makefile
++#>- $(AUTOMAKE) --foreign translations/pt/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -52590,11 +53525,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ro/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/pt/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/ro/Makefile
-+ $(AUTOMAKE) --foreign po/ro/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/ro/Makefile.in
+- $(AUTOMAKE) --gnu translations/pt/messages/Makefile
++ $(AUTOMAKE) --foreign translations/pt/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/pt/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -52617,7 +53552,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -52632,7 +53567,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -52641,7 +53576,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -52656,7 +53591,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -52665,7 +53600,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -52680,7 +53615,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -52705,7 +53640,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -52721,7 +53656,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -52731,12 +53666,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -52745,7 +53680,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -52768,7 +53703,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -52776,7 +53711,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -52785,7 +53720,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -52794,7 +53729,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -52836,7 +53771,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -52844,7 +53779,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/ro/Makefile
+- $(AUTOMAKE) --gnu translations/pt/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -52853,19 +53788,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ro/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/pt/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/ro/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/ro/Makefile.in
++ $(AUTOMAKE) --foreign translations/pt/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/pt/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/ru/Makefile.in gwenview-1.2.0/po/ru/Makefile.in
---- gwenview-1.2.0.orig/po/ru/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/ru/Makefile.in 2005-07-26 19:28:13.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/pt_BR/doc/Makefile.in gwenview-1.3.0/translations/pt_BR/doc/Makefile.in
+--- gwenview-1.3.0.orig/translations/pt_BR/doc/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/pt_BR/doc/Makefile.in 2005-09-12 08:43:49.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -52886,16 +53821,283 @@
@@ -22,7 +21,6 @@
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
+@@ -39,6 +37,21 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/pt_BR/doc
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +177,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +238,8 @@
+ 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@
+@@ -273,6 +291,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -299,27 +318,53 @@
+ xdg_menudir = @xdg_menudir@
+ KDE_LANG = pt_BR
+ KDE_DOCS = gwenview
+-subdir = translations/pt_BR/doc
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ #>- all: all-am
+ #>+ 1
+ all: docs-am all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/pt_BR/doc/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/pt_BR/doc/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/pt_BR/doc/Makefile
++#>+ 12
++ @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) --foreign translations/pt_BR/doc/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/pt_BR/doc/Makefile
++ $(AUTOMAKE) --foreign translations/pt_BR/doc/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/pt_BR/doc/Makefile.in
+-Makefile: $(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
+@@ -336,12 +381,6 @@
+ ctags: CTAGS
+ CTAGS:
+
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -357,7 +396,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -375,7 +414,6 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile
+-
+ installdirs:
+ install: install-am
+ install-exec: install-exec-am
+@@ -398,7 +436,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"
+@@ -419,6 +457,8 @@
+
+ dvi-am:
+
++html: html-am
++
+ info: info-am
+
+ info-am:
+@@ -455,10 +495,10 @@
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+- dvi-am info info-am install install-am install-data \
+- install-data-am install-exec install-exec-am install-info \
+- install-info-am install-man install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
++ dvi-am html html-am info info-am install install-am \
++ install-data install-data-am install-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
+@@ -468,10 +508,10 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=index.docbook keybindings.docbook view_mode.png mouse.docbook docked_windows.docbook browse_mode.png Makefile.in introduction.docbook interface.docbook
++KDE_DIST=index.docbook keybindings.docbook view_mode.png mouse.docbook docked_windows.docbook browse_mode.png Makefile.in introduction.docbook interface.docbook Makefile.am
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) docked_windows.docbook interface.docbook introduction.docbook view_mode.png keybindings.docbook index.docbook mouse.docbook browse_mode.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) mouse.docbook browse_mode.png docked_windows.docbook introduction.docbook interface.docbook view_mode.png index.docbook keybindings.docbook
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -498,27 +538,36 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview
+- @for base in docked_windows.docbook interface.docbook introduction.docbook view_mode.png keybindings.docbook index.docbook mouse.docbook browse_mode.png ; do \
++ @for base in mouse.docbook browse_mode.png docked_windows.docbook introduction.docbook interface.docbook view_mode.png index.docbook keybindings.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in docked_windows.docbook interface.docbook introduction.docbook view_mode.png keybindings.docbook index.docbook mouse.docbook browse_mode.png ; do \
++ for base in mouse.docbook browse_mode.png docked_windows.docbook introduction.docbook interface.docbook view_mode.png index.docbook keybindings.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in docked_windows.docbook interface.docbook introduction.docbook view_mode.png keybindings.docbook index.docbook mouse.docbook browse_mode.png ; do \
++ for file in mouse.docbook browse_mode.png docked_windows.docbook introduction.docbook interface.docbook view_mode.png index.docbook keybindings.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/pt_BR/doc/Makefile
++ @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) --foreign translations/pt_BR/doc/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/pt_BR/doc/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/pt_BR/doc/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/pt_BR/Makefile.in gwenview-1.3.0/translations/pt_BR/Makefile.in
+--- gwenview-1.3.0.orig/translations/pt_BR/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/pt_BR/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/ru
++subdir = translations/pt_BR
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -52925,21 +54127,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -52949,7 +54141,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -52958,78 +54150,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages doc
+-subdir = translations/pt_BR
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = ru
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/pt_BR/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/pt_BR/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/pt_BR/Makefile
++#>+ 12
++ @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) --foreign translations/pt_BR/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/pt_BR/Makefile
++ $(AUTOMAKE) --foreign translations/pt_BR/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/pt_BR/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/pt_BR/Makefile
++ @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) --foreign translations/pt_BR/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/pt_BR/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/pt_BR/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/pt_BR/messages/Makefile.in gwenview-1.3.0/translations/pt_BR/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/pt_BR/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/pt_BR/messages/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/pt_BR/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/ru
+-subdir = translations/pt_BR/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -53064,11 +54613,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ru/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/pt_BR/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/ru/Makefile
+-#>- $(AUTOMAKE) --gnu translations/pt_BR/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/ru/Makefile
++#>- $(AUTOMAKE) --foreign translations/pt_BR/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -53078,11 +54627,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ru/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/pt_BR/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/ru/Makefile
-+ $(AUTOMAKE) --foreign po/ru/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/ru/Makefile.in
+- $(AUTOMAKE) --gnu translations/pt_BR/messages/Makefile
++ $(AUTOMAKE) --foreign translations/pt_BR/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/pt_BR/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -53105,7 +54654,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -53120,7 +54669,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -53129,7 +54678,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -53144,7 +54693,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -53153,7 +54702,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -53168,7 +54717,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -53193,7 +54742,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -53209,7 +54758,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -53219,12 +54768,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -53233,7 +54782,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -53256,7 +54805,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -53264,7 +54813,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -53273,7 +54822,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -53282,7 +54831,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -53324,7 +54873,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -53332,7 +54881,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/ru/Makefile
+- $(AUTOMAKE) --gnu translations/pt_BR/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -53341,19 +54890,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ru/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/pt_BR/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/ru/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/ru/Makefile.in
++ $(AUTOMAKE) --foreign translations/pt_BR/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/pt_BR/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/sr/Makefile.in gwenview-1.2.0/po/sr/Makefile.in
---- gwenview-1.2.0.orig/po/sr/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/sr/Makefile.in 2005-07-26 19:28:13.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/ro/Makefile.in gwenview-1.3.0/translations/ro/Makefile.in
+--- gwenview-1.3.0.orig/translations/ro/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/ro/Makefile.in 2005-09-12 08:43:49.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -53379,11 +54928,11 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/sr
++subdir = translations/ro
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -53413,21 +54962,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -53437,7 +54976,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -53446,78 +54985,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages
+-subdir = translations/ro
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = sr
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ro/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/ro/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/ro/Makefile
++#>+ 12
++ @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) --foreign translations/ro/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/ro/Makefile
++ $(AUTOMAKE) --foreign translations/ro/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ro/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/ro/Makefile
++ @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) --foreign translations/ro/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/ro/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ro/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/ro/messages/Makefile.in gwenview-1.3.0/translations/ro/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/ro/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/ro/messages/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/ro/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/sr
+-subdir = translations/ro/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -53552,11 +55448,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sr/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ro/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/sr/Makefile
+-#>- $(AUTOMAKE) --gnu translations/ro/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/sr/Makefile
++#>- $(AUTOMAKE) --foreign translations/ro/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -53566,11 +55462,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sr/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ro/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/sr/Makefile
-+ $(AUTOMAKE) --foreign po/sr/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/sr/Makefile.in
+- $(AUTOMAKE) --gnu translations/ro/messages/Makefile
++ $(AUTOMAKE) --foreign translations/ro/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ro/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -53593,7 +55489,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -53608,7 +55504,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -53617,7 +55513,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -53632,7 +55528,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -53641,7 +55537,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -53656,7 +55552,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -53681,7 +55577,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -53697,7 +55593,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -53707,12 +55603,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -53721,7 +55617,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -53744,7 +55640,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -53752,7 +55648,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -53761,7 +55657,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -53770,7 +55666,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -53812,7 +55708,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -53820,7 +55716,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/sr/Makefile
+- $(AUTOMAKE) --gnu translations/ro/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -53829,19 +55725,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sr/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ro/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/sr/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/sr/Makefile.in
++ $(AUTOMAKE) --foreign translations/ro/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ro/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/sr at Latn/Makefile.in gwenview-1.2.0/po/sr at Latn/Makefile.in
---- gwenview-1.2.0.orig/po/sr at Latn/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/sr at Latn/Makefile.in 2005-07-26 19:28:13.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/ru/doc/Makefile.in gwenview-1.3.0/translations/ru/doc/Makefile.in
+--- gwenview-1.3.0.orig/translations/ru/doc/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/ru/doc/Makefile.in 2005-09-12 08:43:49.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -53862,16 +55758,283 @@
@@ -22,7 +21,6 @@
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
+@@ -39,6 +37,21 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/ru/doc
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +177,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +238,8 @@
+ 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@
+@@ -273,6 +291,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -299,27 +318,53 @@
+ xdg_menudir = @xdg_menudir@
+ KDE_LANG = ru
+ KDE_DOCS = gwenview
+-subdir = translations/ru/doc
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ #>- all: all-am
+ #>+ 1
+ all: docs-am all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ru/doc/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/ru/doc/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/ru/doc/Makefile
++#>+ 12
++ @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) --foreign translations/ru/doc/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/ru/doc/Makefile
++ $(AUTOMAKE) --foreign translations/ru/doc/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ru/doc/Makefile.in
+-Makefile: $(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
+@@ -336,12 +381,6 @@
+ ctags: CTAGS
+ CTAGS:
+
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -357,7 +396,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -375,7 +414,6 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile
+-
+ installdirs:
+ install: install-am
+ install-exec: install-exec-am
+@@ -398,7 +436,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"
+@@ -419,6 +457,8 @@
+
+ dvi-am:
+
++html: html-am
++
+ info: info-am
+
+ info-am:
+@@ -455,10 +495,10 @@
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+- dvi-am info info-am install install-am install-data \
+- install-data-am install-exec install-exec-am install-info \
+- install-info-am install-man install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
++ dvi-am html html-am info info-am install install-am \
++ install-data install-data-am install-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
+@@ -468,10 +508,10 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=index.docbook keybindings.docbook mouse.docbook docked_windows.docbook Makefile.in introduction.docbook interface.docbook external_tools.docbook
++KDE_DIST=index.docbook keybindings.docbook mouse.docbook docked_windows.docbook Makefile.in introduction.docbook interface.docbook external_tools.docbook Makefile.am
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) external_tools.docbook interface.docbook introduction.docbook docked_windows.docbook keybindings.docbook index.docbook mouse.docbook
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) mouse.docbook external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook index.docbook keybindings.docbook
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -498,27 +538,36 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview
+- @for base in external_tools.docbook interface.docbook introduction.docbook docked_windows.docbook keybindings.docbook index.docbook mouse.docbook ; do \
++ @for base in mouse.docbook external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook index.docbook keybindings.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in external_tools.docbook interface.docbook introduction.docbook docked_windows.docbook keybindings.docbook index.docbook mouse.docbook ; do \
++ for base in mouse.docbook external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook index.docbook keybindings.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in external_tools.docbook interface.docbook introduction.docbook docked_windows.docbook keybindings.docbook index.docbook mouse.docbook ; do \
++ for file in mouse.docbook external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook index.docbook keybindings.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/ru/doc/Makefile
++ @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) --foreign translations/ru/doc/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/ru/doc/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ru/doc/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/ru/Makefile.in gwenview-1.3.0/translations/ru/Makefile.in
+--- gwenview-1.3.0.orig/translations/ru/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/ru/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/sr at Latn
++subdir = translations/ru
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -53901,21 +56064,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -53925,7 +56078,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -53934,78 +56087,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages doc
+-subdir = translations/ru
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = sr at Latn
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ru/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/ru/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/ru/Makefile
++#>+ 12
++ @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) --foreign translations/ru/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/ru/Makefile
++ $(AUTOMAKE) --foreign translations/ru/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ru/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/ru/Makefile
++ @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) --foreign translations/ru/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/ru/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ru/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/ru/messages/Makefile.in gwenview-1.3.0/translations/ru/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/ru/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/ru/messages/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/ru/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/sr at Latn
+-subdir = translations/ru/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -54040,11 +56550,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sr at Latn/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ru/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/sr at Latn/Makefile
+-#>- $(AUTOMAKE) --gnu translations/ru/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/sr at Latn/Makefile
++#>- $(AUTOMAKE) --foreign translations/ru/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -54054,11 +56564,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sr at Latn/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ru/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/sr at Latn/Makefile
-+ $(AUTOMAKE) --foreign po/sr at Latn/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/sr at Latn/Makefile.in
+- $(AUTOMAKE) --gnu translations/ru/messages/Makefile
++ $(AUTOMAKE) --foreign translations/ru/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ru/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -54081,7 +56591,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -54096,7 +56606,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -54105,7 +56615,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -54120,7 +56630,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -54129,7 +56639,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -54144,7 +56654,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -54169,7 +56679,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -54185,7 +56695,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -54195,12 +56705,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -54209,7 +56719,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -54232,7 +56742,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -54240,7 +56750,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -54249,7 +56759,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -54258,7 +56768,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -54300,7 +56810,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -54308,7 +56818,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/sr at Latn/Makefile
+- $(AUTOMAKE) --gnu translations/ru/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -54317,19 +56827,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sr at Latn/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ru/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/sr at Latn/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/sr at Latn/Makefile.in
++ $(AUTOMAKE) --foreign translations/ru/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ru/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/sv/Makefile.in gwenview-1.2.0/po/sv/Makefile.in
---- gwenview-1.2.0.orig/po/sv/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/sv/Makefile.in 2005-07-26 19:28:13.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/rw/Makefile.in gwenview-1.3.0/translations/rw/Makefile.in
+--- gwenview-1.3.0.orig/translations/rw/Makefile.in 2005-09-11 10:40:31.000000000 -0400
++++ gwenview-1.3.0/translations/rw/Makefile.in 2005-09-12 08:43:49.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -54355,11 +56865,11 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/sv
++subdir = translations/rw
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -54389,21 +56899,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -54413,7 +56913,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -54422,78 +56922,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages
+-subdir = translations/rw
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = sv
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/rw/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/rw/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/rw/Makefile
++#>+ 12
++ @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) --foreign translations/rw/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/rw/Makefile
++ $(AUTOMAKE) --foreign translations/rw/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/rw/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/rw/Makefile
++ @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) --foreign translations/rw/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/rw/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/rw/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/rw/messages/Makefile.in gwenview-1.3.0/translations/rw/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/rw/messages/Makefile.in 2005-09-11 10:40:32.000000000 -0400
++++ gwenview-1.3.0/translations/rw/messages/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/rw/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/sv
+-subdir = translations/rw/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -54528,11 +57385,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sv/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/rw/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/sv/Makefile
+-#>- $(AUTOMAKE) --gnu translations/rw/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/sv/Makefile
++#>- $(AUTOMAKE) --foreign translations/rw/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -54542,11 +57399,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sv/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/rw/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/sv/Makefile
-+ $(AUTOMAKE) --foreign po/sv/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/sv/Makefile.in
+- $(AUTOMAKE) --gnu translations/rw/messages/Makefile
++ $(AUTOMAKE) --foreign translations/rw/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/rw/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -54569,7 +57426,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -54584,7 +57441,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -54593,7 +57450,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -54608,7 +57465,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -54617,7 +57474,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -54632,7 +57489,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -54657,7 +57514,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -54673,7 +57530,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -54683,12 +57540,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -54697,7 +57554,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -54720,7 +57577,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -54728,7 +57585,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -54737,7 +57594,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -54746,7 +57603,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -54788,7 +57645,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -54796,7 +57653,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/sv/Makefile
+- $(AUTOMAKE) --gnu translations/rw/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -54805,19 +57662,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sv/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/rw/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/sv/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/sv/Makefile.in
++ $(AUTOMAKE) --foreign translations/rw/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/rw/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/ta/Makefile.in gwenview-1.2.0/po/ta/Makefile.in
---- gwenview-1.2.0.orig/po/ta/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/ta/Makefile.in 2005-07-26 19:28:13.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/sr/Makefile.in gwenview-1.3.0/translations/sr/Makefile.in
+--- gwenview-1.3.0.orig/translations/sr/Makefile.in 2005-09-11 10:40:32.000000000 -0400
++++ gwenview-1.3.0/translations/sr/Makefile.in 2005-09-12 08:43:49.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -54843,11 +57700,11 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/ta
++subdir = translations/sr
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -54877,21 +57734,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -54901,7 +57748,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -54910,78 +57757,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages
+-subdir = translations/sr
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = ta
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/sr/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/sr/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/sr/Makefile
++#>+ 12
++ @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) --foreign translations/sr/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/sr/Makefile
++ $(AUTOMAKE) --foreign translations/sr/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/sr/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/sr/Makefile
++ @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) --foreign translations/sr/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/sr/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/sr/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/sr/messages/Makefile.in gwenview-1.3.0/translations/sr/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/sr/messages/Makefile.in 2005-09-11 10:40:32.000000000 -0400
++++ gwenview-1.3.0/translations/sr/messages/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/sr/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/ta
+-subdir = translations/sr/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -55016,11 +58220,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ta/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/sr/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/ta/Makefile
+-#>- $(AUTOMAKE) --gnu translations/sr/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/ta/Makefile
++#>- $(AUTOMAKE) --foreign translations/sr/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -55030,11 +58234,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ta/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/sr/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/ta/Makefile
-+ $(AUTOMAKE) --foreign po/ta/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/ta/Makefile.in
+- $(AUTOMAKE) --gnu translations/sr/messages/Makefile
++ $(AUTOMAKE) --foreign translations/sr/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/sr/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -55057,7 +58261,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -55072,7 +58276,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -55081,7 +58285,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -55096,7 +58300,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -55105,7 +58309,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -55120,7 +58324,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -55145,7 +58349,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -55161,7 +58365,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -55171,12 +58375,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -55185,7 +58389,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -55208,7 +58412,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -55216,7 +58420,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -55225,7 +58429,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -55234,7 +58438,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -55276,7 +58480,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -55284,7 +58488,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/ta/Makefile
+- $(AUTOMAKE) --gnu translations/sr/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -55293,19 +58497,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ta/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/sr/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/ta/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/ta/Makefile.in
++ $(AUTOMAKE) --foreign translations/sr/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/sr/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/tr/Makefile.in gwenview-1.2.0/po/tr/Makefile.in
---- gwenview-1.2.0.orig/po/tr/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/tr/Makefile.in 2005-07-26 19:28:14.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/sr at Latn/Makefile.in gwenview-1.3.0/translations/sr at Latn/Makefile.in
+--- gwenview-1.3.0.orig/translations/sr at Latn/Makefile.in 2005-09-11 10:40:32.000000000 -0400
++++ gwenview-1.3.0/translations/sr at Latn/Makefile.in 2005-09-12 08:43:49.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -55331,11 +58535,11 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/tr
++subdir = translations/sr at Latn
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -55365,21 +58569,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -55389,7 +58583,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -55398,78 +58592,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages
+-subdir = translations/sr at Latn
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = tr
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/sr at Latn/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/sr at Latn/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/sr at Latn/Makefile
++#>+ 12
++ @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) --foreign translations/sr at Latn/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/sr at Latn/Makefile
++ $(AUTOMAKE) --foreign translations/sr at Latn/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/sr at Latn/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/sr at Latn/Makefile
++ @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) --foreign translations/sr at Latn/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/sr at Latn/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/sr at Latn/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/sr at Latn/messages/Makefile.in gwenview-1.3.0/translations/sr at Latn/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/sr at Latn/messages/Makefile.in 2005-09-11 10:40:32.000000000 -0400
++++ gwenview-1.3.0/translations/sr at Latn/messages/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/sr at Latn/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/tr
+-subdir = translations/sr at Latn/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -55504,11 +59055,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/tr/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/sr at Latn/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/tr/Makefile
+-#>- $(AUTOMAKE) --gnu translations/sr at Latn/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/tr/Makefile
++#>- $(AUTOMAKE) --foreign translations/sr at Latn/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -55518,11 +59069,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/tr/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/sr at Latn/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/tr/Makefile
-+ $(AUTOMAKE) --foreign po/tr/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/tr/Makefile.in
+- $(AUTOMAKE) --gnu translations/sr at Latn/messages/Makefile
++ $(AUTOMAKE) --foreign translations/sr at Latn/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/sr at Latn/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -55545,7 +59096,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -55560,7 +59111,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -55569,7 +59120,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -55584,7 +59135,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -55593,7 +59144,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -55608,7 +59159,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -55633,7 +59184,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -55649,7 +59200,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -55659,12 +59210,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -55673,7 +59224,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -55696,7 +59247,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -55704,7 +59255,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -55713,7 +59264,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -55722,7 +59273,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -55764,7 +59315,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -55772,7 +59323,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/tr/Makefile
+- $(AUTOMAKE) --gnu translations/sr at Latn/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -55781,19 +59332,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/tr/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/sr at Latn/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/tr/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/tr/Makefile.in
++ $(AUTOMAKE) --foreign translations/sr at Latn/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/sr at Latn/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/uk/Makefile.in gwenview-1.2.0/po/uk/Makefile.in
---- gwenview-1.2.0.orig/po/uk/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/uk/Makefile.in 2005-07-26 19:28:14.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/sv/doc/Makefile.in gwenview-1.3.0/translations/sv/doc/Makefile.in
+--- gwenview-1.3.0.orig/translations/sv/doc/Makefile.in 2005-09-11 10:40:32.000000000 -0400
++++ gwenview-1.3.0/translations/sv/doc/Makefile.in 2005-09-12 08:43:49.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -55814,16 +59365,283 @@
@@ -22,7 +21,6 @@
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
+@@ -39,6 +37,21 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/sv/doc
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +177,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +238,8 @@
+ 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@
+@@ -273,6 +291,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -299,27 +318,53 @@
+ xdg_menudir = @xdg_menudir@
+ KDE_LANG = sv
+ KDE_DOCS = gwenview
+-subdir = translations/sv/doc
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ #>- all: all-am
+ #>+ 1
+ all: docs-am all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/sv/doc/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/sv/doc/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/sv/doc/Makefile
++#>+ 12
++ @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) --foreign translations/sv/doc/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/sv/doc/Makefile
++ $(AUTOMAKE) --foreign translations/sv/doc/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/sv/doc/Makefile.in
+-Makefile: $(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
+@@ -336,12 +381,6 @@
+ ctags: CTAGS
+ CTAGS:
+
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -357,7 +396,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -375,7 +414,6 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile
+-
+ installdirs:
+ install: install-am
+ install-exec: install-exec-am
+@@ -398,7 +436,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"
+@@ -419,6 +457,8 @@
+
+ dvi-am:
+
++html: html-am
++
+ info: info-am
+
+ info-am:
+@@ -455,10 +495,10 @@
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+- dvi-am info info-am install install-am install-data \
+- install-data-am install-exec install-exec-am install-info \
+- install-info-am install-man install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
++ dvi-am html html-am info info-am install install-am \
++ install-data install-data-am install-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
+@@ -468,10 +508,10 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=index.docbook keybindings.docbook mouse.docbook docked_windows.docbook Makefile.in introduction.docbook interface.docbook external_tools.docbook
++KDE_DIST=index.docbook keybindings.docbook mouse.docbook docked_windows.docbook Makefile.in introduction.docbook interface.docbook external_tools.docbook Makefile.am
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) external_tools.docbook interface.docbook introduction.docbook docked_windows.docbook keybindings.docbook index.docbook mouse.docbook
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) mouse.docbook external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook index.docbook keybindings.docbook
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -498,27 +538,36 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview
+- @for base in external_tools.docbook interface.docbook introduction.docbook docked_windows.docbook keybindings.docbook index.docbook mouse.docbook ; do \
++ @for base in mouse.docbook external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook index.docbook keybindings.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in external_tools.docbook interface.docbook introduction.docbook docked_windows.docbook keybindings.docbook index.docbook mouse.docbook ; do \
++ for base in mouse.docbook external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook index.docbook keybindings.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in external_tools.docbook interface.docbook introduction.docbook docked_windows.docbook keybindings.docbook index.docbook mouse.docbook ; do \
++ for file in mouse.docbook external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook index.docbook keybindings.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/sv/doc/Makefile
++ @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) --foreign translations/sv/doc/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/sv/doc/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/sv/doc/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/sv/Makefile.in gwenview-1.3.0/translations/sv/Makefile.in
+--- gwenview-1.3.0.orig/translations/sv/Makefile.in 2005-09-11 10:40:32.000000000 -0400
++++ gwenview-1.3.0/translations/sv/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/uk
++subdir = translations/sv
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -55853,21 +59671,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -55877,7 +59685,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -55886,78 +59694,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages doc
+-subdir = translations/sv
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = uk
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/sv/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/sv/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/sv/Makefile
++#>+ 12
++ @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) --foreign translations/sv/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/sv/Makefile
++ $(AUTOMAKE) --foreign translations/sv/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/sv/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/sv/Makefile
++ @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) --foreign translations/sv/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/sv/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/sv/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/sv/messages/Makefile.in gwenview-1.3.0/translations/sv/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/sv/messages/Makefile.in 2005-09-11 10:40:32.000000000 -0400
++++ gwenview-1.3.0/translations/sv/messages/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/sv/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/uk
+-subdir = translations/sv/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -55992,11 +60157,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/uk/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/sv/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/uk/Makefile
+-#>- $(AUTOMAKE) --gnu translations/sv/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/uk/Makefile
++#>- $(AUTOMAKE) --foreign translations/sv/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -56006,11 +60171,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/uk/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/sv/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/uk/Makefile
-+ $(AUTOMAKE) --foreign po/uk/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/uk/Makefile.in
+- $(AUTOMAKE) --gnu translations/sv/messages/Makefile
++ $(AUTOMAKE) --foreign translations/sv/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/sv/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -56033,7 +60198,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -56048,7 +60213,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -56057,7 +60222,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -56072,7 +60237,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -56081,7 +60246,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -56096,7 +60261,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -56121,7 +60286,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -56137,7 +60302,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -56147,12 +60312,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -56161,7 +60326,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -56184,7 +60349,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -56192,7 +60357,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -56201,7 +60366,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -56210,7 +60375,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -56252,7 +60417,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -56260,7 +60425,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/uk/Makefile
+- $(AUTOMAKE) --gnu translations/sv/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -56269,19 +60434,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/uk/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/sv/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/uk/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/uk/Makefile.in
++ $(AUTOMAKE) --foreign translations/sv/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/sv/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/ven/Makefile.in gwenview-1.2.0/po/ven/Makefile.in
---- gwenview-1.2.0.orig/po/ven/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/ven/Makefile.in 2005-07-26 19:28:14.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/ta/Makefile.in gwenview-1.3.0/translations/ta/Makefile.in
+--- gwenview-1.3.0.orig/translations/ta/Makefile.in 2005-09-11 10:40:32.000000000 -0400
++++ gwenview-1.3.0/translations/ta/Makefile.in 2005-09-12 08:43:49.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -56307,11 +60472,11 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/ven
++subdir = translations/ta
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -56341,21 +60506,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -56365,7 +60520,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -56374,78 +60529,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages
+-subdir = translations/ta
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = ven
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ta/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/ta/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/ta/Makefile
++#>+ 12
++ @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) --foreign translations/ta/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/ta/Makefile
++ $(AUTOMAKE) --foreign translations/ta/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ta/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/ta/Makefile
++ @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) --foreign translations/ta/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/ta/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ta/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/ta/messages/Makefile.in gwenview-1.3.0/translations/ta/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/ta/messages/Makefile.in 2005-09-11 10:40:32.000000000 -0400
++++ gwenview-1.3.0/translations/ta/messages/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/ta/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/ven
+-subdir = translations/ta/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -56480,11 +60992,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ven/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ta/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/ven/Makefile
+-#>- $(AUTOMAKE) --gnu translations/ta/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/ven/Makefile
++#>- $(AUTOMAKE) --foreign translations/ta/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -56494,11 +61006,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ven/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ta/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/ven/Makefile
-+ $(AUTOMAKE) --foreign po/ven/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/ven/Makefile.in
+- $(AUTOMAKE) --gnu translations/ta/messages/Makefile
++ $(AUTOMAKE) --foreign translations/ta/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ta/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -56521,7 +61033,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -56536,7 +61048,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -56545,7 +61057,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -56560,7 +61072,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -56569,7 +61081,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -56584,7 +61096,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -56609,7 +61121,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -56625,7 +61137,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -56635,12 +61147,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -56649,7 +61161,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -56672,7 +61184,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -56680,7 +61192,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -56689,7 +61201,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -56698,7 +61210,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -56740,7 +61252,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -56748,7 +61260,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/ven/Makefile
+- $(AUTOMAKE) --gnu translations/ta/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -56757,19 +61269,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ven/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ta/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/ven/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/ven/Makefile.in
++ $(AUTOMAKE) --foreign translations/ta/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ta/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/xh/Makefile.in gwenview-1.2.0/po/xh/Makefile.in
---- gwenview-1.2.0.orig/po/xh/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/xh/Makefile.in 2005-07-26 19:28:14.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/tr/Makefile.in gwenview-1.3.0/translations/tr/Makefile.in
+--- gwenview-1.3.0.orig/translations/tr/Makefile.in 2005-09-11 10:40:32.000000000 -0400
++++ gwenview-1.3.0/translations/tr/Makefile.in 2005-09-12 08:43:49.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -56795,11 +61307,11 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/xh
++subdir = translations/tr
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -56829,21 +61341,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -56853,7 +61355,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -56862,78 +61364,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages
+-subdir = translations/tr
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = xh
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/tr/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/tr/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/tr/Makefile
++#>+ 12
++ @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) --foreign translations/tr/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/tr/Makefile
++ $(AUTOMAKE) --foreign translations/tr/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/tr/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/tr/Makefile
++ @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) --foreign translations/tr/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/tr/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/tr/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/tr/messages/Makefile.in gwenview-1.3.0/translations/tr/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/tr/messages/Makefile.in 2005-09-11 10:40:32.000000000 -0400
++++ gwenview-1.3.0/translations/tr/messages/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/tr/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/xh
+-subdir = translations/tr/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -56968,11 +61827,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/xh/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/tr/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/xh/Makefile
+-#>- $(AUTOMAKE) --gnu translations/tr/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/xh/Makefile
++#>- $(AUTOMAKE) --foreign translations/tr/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -56982,11 +61841,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/xh/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/tr/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/xh/Makefile
-+ $(AUTOMAKE) --foreign po/xh/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/xh/Makefile.in
+- $(AUTOMAKE) --gnu translations/tr/messages/Makefile
++ $(AUTOMAKE) --foreign translations/tr/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/tr/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -57009,7 +61868,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -57024,7 +61883,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -57033,7 +61892,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -57048,7 +61907,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -57057,7 +61916,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -57072,7 +61931,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -57097,7 +61956,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -57113,7 +61972,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -57123,12 +61982,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -57137,7 +61996,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -57160,7 +62019,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -57168,7 +62027,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -57177,7 +62036,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -57186,7 +62045,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -57228,7 +62087,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -57236,7 +62095,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/xh/Makefile
+- $(AUTOMAKE) --gnu translations/tr/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -57245,19 +62104,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/xh/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/tr/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/xh/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/xh/Makefile.in
++ $(AUTOMAKE) --foreign translations/tr/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/tr/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/xx/Makefile.in gwenview-1.2.0/po/xx/Makefile.in
---- gwenview-1.2.0.orig/po/xx/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/xx/Makefile.in 2005-07-26 19:28:14.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/uk/Makefile.in gwenview-1.3.0/translations/uk/Makefile.in
+--- gwenview-1.3.0.orig/translations/uk/Makefile.in 2005-09-11 10:40:32.000000000 -0400
++++ gwenview-1.3.0/translations/uk/Makefile.in 2005-09-12 08:43:49.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -57283,11 +62142,11 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/xx
++subdir = translations/uk
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -57317,21 +62176,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -57341,7 +62190,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -57350,78 +62199,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages
+-subdir = translations/uk
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = xx
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/uk/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/uk/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/uk/Makefile
++#>+ 12
++ @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) --foreign translations/uk/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/uk/Makefile
++ $(AUTOMAKE) --foreign translations/uk/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/uk/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/uk/Makefile
++ @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) --foreign translations/uk/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/uk/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/uk/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/uk/messages/Makefile.in gwenview-1.3.0/translations/uk/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/uk/messages/Makefile.in 2005-09-11 10:40:32.000000000 -0400
++++ gwenview-1.3.0/translations/uk/messages/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/uk/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/xx
+-subdir = translations/uk/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -57456,11 +62662,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/xx/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/uk/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/xx/Makefile
+-#>- $(AUTOMAKE) --gnu translations/uk/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/xx/Makefile
++#>- $(AUTOMAKE) --foreign translations/uk/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -57470,11 +62676,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/xx/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/uk/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/xx/Makefile
-+ $(AUTOMAKE) --foreign po/xx/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/xx/Makefile.in
+- $(AUTOMAKE) --gnu translations/uk/messages/Makefile
++ $(AUTOMAKE) --foreign translations/uk/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/uk/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -57497,7 +62703,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -57512,7 +62718,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -57521,7 +62727,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -57536,7 +62742,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -57545,7 +62751,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -57560,7 +62766,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -57585,7 +62791,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -57601,7 +62807,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -57611,12 +62817,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -57625,7 +62831,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -57648,7 +62854,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -57656,7 +62862,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -57665,7 +62871,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -57674,7 +62880,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -57716,7 +62922,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -57724,7 +62930,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/xx/Makefile
+- $(AUTOMAKE) --gnu translations/uk/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -57733,19 +62939,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/xx/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/uk/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/xx/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/xx/Makefile.in
++ $(AUTOMAKE) --foreign translations/uk/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/uk/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/zh_CN/Makefile.in gwenview-1.2.0/po/zh_CN/Makefile.in
---- gwenview-1.2.0.orig/po/zh_CN/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/zh_CN/Makefile.in 2005-07-26 19:28:14.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/ven/Makefile.in gwenview-1.3.0/translations/ven/Makefile.in
+--- gwenview-1.3.0.orig/translations/ven/Makefile.in 2005-09-11 10:40:32.000000000 -0400
++++ gwenview-1.3.0/translations/ven/Makefile.in 2005-09-12 08:43:49.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -57771,11 +62977,11 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/zh_CN
++subdir = translations/ven
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -57805,21 +63011,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -57829,7 +63025,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -57838,78 +63034,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages
+-subdir = translations/ven
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = zh_CN
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ven/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/ven/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/ven/Makefile
++#>+ 12
++ @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) --foreign translations/ven/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/ven/Makefile
++ $(AUTOMAKE) --foreign translations/ven/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ven/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/ven/Makefile
++ @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) --foreign translations/ven/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/ven/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ven/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/ven/messages/Makefile.in gwenview-1.3.0/translations/ven/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/ven/messages/Makefile.in 2005-09-11 10:40:32.000000000 -0400
++++ gwenview-1.3.0/translations/ven/messages/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/ven/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/zh_CN
+-subdir = translations/ven/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -57944,11 +63497,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/zh_CN/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ven/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/zh_CN/Makefile
+-#>- $(AUTOMAKE) --gnu translations/ven/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/zh_CN/Makefile
++#>- $(AUTOMAKE) --foreign translations/ven/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -57958,11 +63511,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/zh_CN/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ven/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/zh_CN/Makefile
-+ $(AUTOMAKE) --foreign po/zh_CN/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/zh_CN/Makefile.in
+- $(AUTOMAKE) --gnu translations/ven/messages/Makefile
++ $(AUTOMAKE) --foreign translations/ven/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ven/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -57985,7 +63538,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -58000,7 +63553,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -58009,7 +63562,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -58024,7 +63577,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -58033,7 +63586,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -58048,7 +63601,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -58073,7 +63626,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -58089,7 +63642,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -58099,12 +63652,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -58113,7 +63666,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -58136,7 +63689,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -58144,7 +63697,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -58153,7 +63706,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -58162,7 +63715,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -58204,7 +63757,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -58212,7 +63765,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/zh_CN/Makefile
+- $(AUTOMAKE) --gnu translations/ven/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -58221,19 +63774,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/zh_CN/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/ven/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/zh_CN/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/zh_CN/Makefile.in
++ $(AUTOMAKE) --foreign translations/ven/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/ven/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/zh_TW/Makefile.in gwenview-1.2.0/po/zh_TW/Makefile.in
---- gwenview-1.2.0.orig/po/zh_TW/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/zh_TW/Makefile.in 2005-07-26 19:28:14.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/xh/Makefile.in gwenview-1.3.0/translations/xh/Makefile.in
+--- gwenview-1.3.0.orig/translations/xh/Makefile.in 2005-09-11 10:40:32.000000000 -0400
++++ gwenview-1.3.0/translations/xh/Makefile.in 2005-09-12 08:43:49.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -58259,11 +63812,11 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/zh_TW
++subdir = translations/xh
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -58293,21 +63846,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -58317,7 +63860,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -58326,78 +63869,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages
+-subdir = translations/xh
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = zh_TW
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/xh/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/xh/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/xh/Makefile
++#>+ 12
++ @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) --foreign translations/xh/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/xh/Makefile
++ $(AUTOMAKE) --foreign translations/xh/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/xh/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/xh/Makefile
++ @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) --foreign translations/xh/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/xh/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/xh/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/xh/messages/Makefile.in gwenview-1.3.0/translations/xh/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/xh/messages/Makefile.in 2005-09-11 10:40:32.000000000 -0400
++++ gwenview-1.3.0/translations/xh/messages/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/xh/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/zh_TW
+-subdir = translations/xh/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -58432,11 +64332,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/zh_TW/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/xh/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/zh_TW/Makefile
+-#>- $(AUTOMAKE) --gnu translations/xh/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/zh_TW/Makefile
++#>- $(AUTOMAKE) --foreign translations/xh/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -58446,11 +64346,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/zh_TW/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/xh/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/zh_TW/Makefile
-+ $(AUTOMAKE) --foreign po/zh_TW/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/zh_TW/Makefile.in
+- $(AUTOMAKE) --gnu translations/xh/messages/Makefile
++ $(AUTOMAKE) --foreign translations/xh/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/xh/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -58473,7 +64373,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -58488,7 +64388,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -58497,7 +64397,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -58512,7 +64412,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -58521,7 +64421,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -58536,7 +64436,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -58561,7 +64461,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -58577,7 +64477,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -58587,12 +64487,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -58601,7 +64501,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -58624,7 +64524,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -58632,7 +64532,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -58641,7 +64541,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -58650,7 +64550,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -58692,7 +64592,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -58700,7 +64600,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/zh_TW/Makefile
+- $(AUTOMAKE) --gnu translations/xh/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -58709,19 +64609,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/zh_TW/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/xh/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/zh_TW/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/zh_TW/Makefile.in
++ $(AUTOMAKE) --foreign translations/xh/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/xh/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/po/zu/Makefile.in gwenview-1.2.0/po/zu/Makefile.in
---- gwenview-1.2.0.orig/po/zu/Makefile.in 2005-04-03 13:19:03.000000000 +0000
-+++ gwenview-1.2.0/po/zu/Makefile.in 2005-07-26 19:28:14.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/zh_CN/Makefile.in gwenview-1.3.0/translations/zh_CN/Makefile.in
+--- gwenview-1.3.0.orig/translations/zh_CN/Makefile.in 2005-09-11 10:40:32.000000000 -0400
++++ gwenview-1.3.0/translations/zh_CN/Makefile.in 2005-09-12 08:43:49.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -58747,11 +64647,11 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = po/zu
++subdir = translations/zh_CN
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -58781,21 +64681,11 @@
+DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +142,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +181,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -58805,7 +64695,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +240,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -58814,78 +64704,435 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +249,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +287,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -298,50 +310,61 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages
+-subdir = translations/zh_CN
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
-
- KDE_LANG = zu
- #>- SUBDIRS = $(AUTODIRS)
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- SUBDIRS =.
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/zh_CN/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/zh_CN/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/zh_CN/Makefile
++#>+ 12
++ @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) --foreign translations/zh_CN/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/zh_CN/Makefile
++ $(AUTOMAKE) --foreign translations/zh_CN/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/zh_CN/Makefile.in
+-Makefile: $(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
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
-
- #>- POFILES = AUTO
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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)
+@@ -466,12 +522,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -485,7 +535,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,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"
+@@ -560,6 +611,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -594,37 +647,42 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
#>+ 2
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/zh_CN/Makefile
++ @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) --foreign translations/zh_CN/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/zh_CN/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/zh_CN/Makefile.in
+
+
+diff -Nru gwenview-1.3.0.orig/translations/zh_CN/messages/Makefile.in gwenview-1.3.0/translations/zh_CN/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/zh_CN/messages/Makefile.in 2005-09-11 10:40:32.000000000 -0400
++++ gwenview-1.3.0/translations/zh_CN/messages/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/zh_CN/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
+ #>+ 2
POFILES = gwenview.po
GMOFILES = gwenview.gmo
--subdir = po/zu
+-subdir = translations/zh_CN/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
@@ -58920,11 +65167,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/zu/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/zh_CN/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/zu/Makefile
+-#>- $(AUTOMAKE) --gnu translations/zh_CN/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign po/zu/Makefile
++#>- $(AUTOMAKE) --foreign translations/zh_CN/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -58934,11 +65181,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/zu/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/zh_CN/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/zu/Makefile
-+ $(AUTOMAKE) --foreign po/zu/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/zu/Makefile.in
+- $(AUTOMAKE) --gnu translations/zh_CN/messages/Makefile
++ $(AUTOMAKE) --foreign translations/zh_CN/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/zh_CN/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -58961,7 +65208,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -360,7 +383,13 @@
+@@ -357,7 +407,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):
@@ -58976,7 +65223,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -372,7 +401,7 @@
+@@ -369,7 +425,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -58985,7 +65232,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -380,7 +409,13 @@
+@@ -377,7 +433,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -59000,7 +65247,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -401,7 +436,7 @@
+@@ -398,7 +460,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -59009,7 +65256,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -412,14 +447,6 @@
+@@ -409,14 +471,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -59024,7 +65271,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -428,19 +455,22 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
@@ -59049,7 +65296,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -450,10 +480,11 @@
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -59065,7 +65312,7 @@
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -476,14 +507,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -59075,12 +65322,12 @@
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ../..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
#>- distdir: $(DISTFILES)
#>+ 1
-@@ -499,7 +522,7 @@
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -59089,7 +65336,7 @@
else \
dir=''; \
fi; \
-@@ -514,15 +537,17 @@
+@@ -511,15 +561,17 @@
|| exit 1; \
fi; \
done
@@ -59112,7 +65359,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -532,7 +557,6 @@
+@@ -529,7 +581,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -59120,7 +65367,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -554,7 +578,7 @@
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -59129,7 +65376,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -576,6 +600,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
@@ -59138,7 +65385,7 @@
info: info-recursive
info-am:
-@@ -614,29 +640,25 @@
+@@ -611,29 +664,25 @@
uninstall-info: uninstall-info-recursive
@@ -59180,7 +65427,7 @@
#>+ 4
gwenview.gmo: gwenview.po
-@@ -677,10 +699,19 @@
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -59188,7 +65435,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/zu/Makefile
+- $(AUTOMAKE) --gnu translations/zh_CN/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -59197,19 +65444,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/zu/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/zh_CN/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/zu/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/zu/Makefile.in
++ $(AUTOMAKE) --foreign translations/zh_CN/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/zh_CN/messages/Makefile.in
-diff -Nru gwenview-1.2.0.orig/src/Makefile.in gwenview-1.2.0/src/Makefile.in
---- gwenview-1.2.0.orig/src/Makefile.in 2005-04-03 13:19:04.000000000 +0000
-+++ gwenview-1.2.0/src/Makefile.in 2005-07-26 19:28:14.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/zh_TW/Makefile.in gwenview-1.3.0/translations/zh_TW/Makefile.in
+--- gwenview-1.3.0.orig/translations/zh_TW/Makefile.in 2005-09-11 10:40:32.000000000 -0400
++++ gwenview-1.3.0/translations/zh_TW/Makefile.in 2005-09-12 08:43:49.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -59219,28 +65466,27 @@
# 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,6 +15,8 @@
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
@SET_MAKE@
-
-+SOURCES = $(libgwenviewcore_la_SOURCES)
-+
+-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -22,7 +24,6 @@
+@@ -22,7 +21,6 @@
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
-@@ -39,6 +40,100 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = src
++subdir = translations/zh_TW
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -59250,102 +65496,31 @@
+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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)"
-+libLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(lib_LTLIBRARIES)
-+am__DEPENDENCIES_1 =
-+libgwenviewcore_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+ $(am__DEPENDENCIES_1) ../libgvcompat/libgvcompat.la \
-+ ../libgvexif/libgvexif.la ../gvimageutils/libgvimageutils.la \
-+ ../tsthread/libtsthread.la
-+am_libgwenviewcore_la_OBJECTS = thumbnailsize.lo thumbnailloadjob.lo \
-+ gvscrollpixmapview.lo gvprintdialog.lo gvbatchmanipulator.lo \
-+ gvmainwindow.lo gvdocument.lo gvdirview.lo gvfileviewstack.lo \
-+ gvfilethumbnailview.lo fileoperation.lo gvconfigdialog.lo \
-+ gvbranchpropertiesdialog.lo fileopobject.lo \
-+ gvfilethumbnailviewitem.lo qxcfi.lo gvarchive.lo \
-+ gvslideshow.lo gvfiledetailview.lo gvfiledetailviewitem.lo \
-+ gvbookmarkowner.lo gvimagesavedialog.lo gvslideshowdialog.lo \
-+ gvmetaedit.lo gvexternaltoolmanager.lo \
-+ gvexternaltoolcontext.lo gvexternaltoolaction.lo \
-+ gvexternaltooldialog.lo gvhistory.lo gvjpegformattype.lo \
-+ gvpngformattype.lo gvxpm.lo gvdocumentimpl.lo \
-+ gvdocumentdecodeimpl.lo gvdocumentloadedimpl.lo \
-+ gvdocumentjpegloadedimpl.lo gvdocumentanimatedloadedimpl.lo \
-+ gvkipiinterface.lo gvbusylevelmanager.lo gvcache.lo \
-+ gvthreadgate.lo gvscrollpixmapviewtools.lo gvfullscreenbar.lo \
-+ main.lo
-+#>- libgwenviewcore_la_OBJECTS = $(am_libgwenviewcore_la_OBJECTS)
-+#>+ 20
-+libgwenviewcore_la_final_OBJECTS = libgwenviewcore_la.all_cpp.lo
-+libgwenviewcore_la_nofinal_OBJECTS = thumbnailsize.lo thumbnailloadjob.lo \
-+ gvscrollpixmapview.lo gvprintdialog.lo gvbatchmanipulator.lo \
-+ gvmainwindow.lo gvdocument.lo gvdirview.lo gvfileviewstack.lo \
-+ gvfilethumbnailview.lo fileoperation.lo gvconfigdialog.lo \
-+ gvbranchpropertiesdialog.lo fileopobject.lo \
-+ gvfilethumbnailviewitem.lo qxcfi.lo gvarchive.lo \
-+ gvslideshow.lo gvfiledetailview.lo gvfiledetailviewitem.lo \
-+ gvbookmarkowner.lo gvimagesavedialog.lo gvslideshowdialog.lo \
-+ gvmetaedit.lo gvexternaltoolmanager.lo \
-+ gvexternaltoolcontext.lo gvexternaltoolaction.lo \
-+ gvexternaltooldialog.lo gvhistory.lo gvjpegformattype.lo \
-+ gvpngformattype.lo gvxpm.lo gvdocumentimpl.lo \
-+ gvdocumentdecodeimpl.lo gvdocumentloadedimpl.lo \
-+ gvdocumentjpegloadedimpl.lo gvdocumentanimatedloadedimpl.lo \
-+ gvkipiinterface.lo gvbusylevelmanager.lo gvcache.lo \
-+ gvthreadgate.lo gvscrollpixmapviewtools.lo gvfullscreenbar.lo \
-+ main.lo gvconfigfileoperationspage.lo gvconfigfullscreenpage.lo gvconfigimagelistpage.lo gvconfigimageviewpage.lo gvconfigmiscpage.lo gvbranchpropertiesdialogbase.lo gvslideshowdialogbase.lo gvexternaltooldialogbase.lo gvprintdialogpagebase.lo
-+ at KDE_USE_FINAL_FALSE@libgwenviewcore_la_OBJECTS = $(libgwenviewcore_la_nofinal_OBJECTS)
-+ at KDE_USE_FINAL_TRUE@libgwenviewcore_la_OBJECTS = $(libgwenviewcore_la_final_OBJECTS)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-+am__depfiles_maybe = depfiles
-+#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 2
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+#>- $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 3
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+CXXLD = $(CXX)
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>+ 2
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libgwenviewcore_la_SOURCES)
-+DIST_SOURCES = $(libgwenviewcore_la_SOURCES)
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- html-recursive info-recursive install-data-recursive \
++#>- install-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
+ETAGS = etags
+CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +206,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +245,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -59355,7 +65530,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +304,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -59364,297 +65539,43 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +313,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +351,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -299,13 +375,10 @@
+@@ -298,40 +333,53 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
- AM_CPPFLAGS = -I$(srcdir)/.. $(all_includes) -D_LARGEFILE64_SOURCE
--
- lib_LTLIBRARIES = libgwenviewcore.la
--
- #>- libgwenviewcore_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
- #>+ 1
- libgwenviewcore_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined $(KDE_NO_UNDEFINED)
--
- libgwenviewcore_la_LIBADD = \
- $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KDEPRINT) $(LIB_QT) \
- $(LIBJPEG) $(LIBPNG) $(LIB_KIPI) \
-@@ -313,9 +386,7 @@
- ../libgvexif/libgvexif.la ../gvimageutils/libgvimageutils.la \
- ../tsthread/libtsthread.la
-
--
- #>- libgwenviewcore_la_METASOURCES = AUTO
--
- #>- libgwenviewcore_la_SOURCES = \
- #>- gvconfigfileoperationspage.ui \
- #>- gvconfigfullscreenpage.ui \
-@@ -426,246 +497,78 @@
- gvfullscreenbar.cpp \
- main.cpp gvconfigfileoperationspage.cpp gvconfigfullscreenpage.cpp gvconfigimagelistpage.cpp gvconfigimageviewpage.cpp gvconfigmiscpage.cpp gvbranchpropertiesdialogbase.cpp gvslideshowdialogbase.cpp gvexternaltooldialogbase.cpp gvprintdialogpagebase.cpp
-
--subdir = src
+ SUBDIRS = messages
+-subdir = translations/zh_TW
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
--LTLIBRARIES = $(lib_LTLIBRARIES)
+-DIST_SOURCES =
-
--libgwenviewcore_la_DEPENDENCIES = ../libgvcompat/libgvcompat.la \
-- ../libgvexif/libgvexif.la ../gvimageutils/libgvimageutils.la \
-- ../tsthread/libtsthread.la
--am_libgwenviewcore_la_OBJECTS = thumbnailsize.lo thumbnailloadjob.lo \
-- gvscrollpixmapview.lo gvprintdialog.lo gvbatchmanipulator.lo \
-- gvmainwindow.lo gvdocument.lo gvdirview.lo gvfileviewstack.lo \
-- gvfilethumbnailview.lo fileoperation.lo gvconfigdialog.lo \
-- gvbranchpropertiesdialog.lo fileopobject.lo \
-- gvfilethumbnailviewitem.lo qxcfi.lo gvarchive.lo gvslideshow.lo \
-- gvfiledetailview.lo gvfiledetailviewitem.lo gvbookmarkowner.lo \
-- gvimagesavedialog.lo gvslideshowdialog.lo gvmetaedit.lo \
-- gvexternaltoolmanager.lo gvexternaltoolcontext.lo \
-- gvexternaltoolaction.lo gvexternaltooldialog.lo gvhistory.lo \
-- gvjpegformattype.lo gvpngformattype.lo gvxpm.lo \
-- gvdocumentimpl.lo gvdocumentdecodeimpl.lo \
-- gvdocumentloadedimpl.lo gvdocumentjpegloadedimpl.lo \
-- gvdocumentanimatedloadedimpl.lo gvkipiinterface.lo \
-- gvbusylevelmanager.lo gvcache.lo gvthreadgate.lo \
-- gvscrollpixmapviewtools.lo gvfullscreenbar.lo main.lo
--#>- libgwenviewcore_la_OBJECTS = $(am_libgwenviewcore_la_OBJECTS)
--#>+ 19
--libgwenviewcore_la_final_OBJECTS = libgwenviewcore_la.all_cpp.lo
--libgwenviewcore_la_nofinal_OBJECTS = thumbnailsize.lo thumbnailloadjob.lo \
-- gvscrollpixmapview.lo gvprintdialog.lo gvbatchmanipulator.lo \
-- gvmainwindow.lo gvdocument.lo gvdirview.lo gvfileviewstack.lo \
-- gvfilethumbnailview.lo fileoperation.lo gvconfigdialog.lo \
-- gvbranchpropertiesdialog.lo fileopobject.lo \
-- gvfilethumbnailviewitem.lo qxcfi.lo gvarchive.lo gvslideshow.lo \
-- gvfiledetailview.lo gvfiledetailviewitem.lo gvbookmarkowner.lo \
-- gvimagesavedialog.lo gvslideshowdialog.lo gvmetaedit.lo \
-- gvexternaltoolmanager.lo gvexternaltoolcontext.lo \
-- gvexternaltoolaction.lo gvexternaltooldialog.lo gvhistory.lo \
-- gvjpegformattype.lo gvpngformattype.lo gvxpm.lo \
-- gvdocumentimpl.lo gvdocumentdecodeimpl.lo \
-- gvdocumentloadedimpl.lo gvdocumentjpegloadedimpl.lo \
-- gvdocumentanimatedloadedimpl.lo gvkipiinterface.lo \
-- gvbusylevelmanager.lo gvcache.lo gvthreadgate.lo \
-- gvscrollpixmapviewtools.lo gvfullscreenbar.lo main.lo gvconfigfileoperationspage.lo gvconfigfullscreenpage.lo gvconfigimagelistpage.lo gvconfigimageviewpage.lo gvconfigmiscpage.lo gvbranchpropertiesdialogbase.lo gvslideshowdialogbase.lo gvexternaltooldialogbase.lo gvprintdialogpagebase.lo
-- at KDE_USE_FINAL_FALSE@libgwenviewcore_la_OBJECTS = $(libgwenviewcore_la_nofinal_OBJECTS)
-- at KDE_USE_FINAL_TRUE@libgwenviewcore_la_OBJECTS = $(libgwenviewcore_la_final_OBJECTS)
--
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
--depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--am__depfiles_maybe = depfiles
--#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/fileoperation.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/fileopobject.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvarchive.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvbatchmanipulator.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvbookmarkowner.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvbranchpropertiesdialog.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvbusylevelmanager.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvcache.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvconfigdialog.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvdirview.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvdocument.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvdocumentanimatedloadedimpl.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvdocumentdecodeimpl.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvdocumentimpl.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvdocumentjpegloadedimpl.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvdocumentloadedimpl.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvexternaltoolaction.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvexternaltoolcontext.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvexternaltooldialog.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvexternaltoolmanager.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvfiledetailview.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvfiledetailviewitem.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvfilethumbnailview.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvfilethumbnailviewitem.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvfileviewstack.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvfullscreenbar.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvhistory.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvimagesavedialog.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvjpegformattype.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvkipiinterface.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvmainwindow.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvmetaedit.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvpngformattype.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvprintdialog.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvscrollpixmapview.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvscrollpixmapviewtools.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvslideshow.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvslideshowdialog.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gvthreadgate.Plo ./$(DEPDIR)/gvxpm.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo ./$(DEPDIR)/qxcfi.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/thumbnailloadjob.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/thumbnailsize.Plo
--#>+ 84
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/gvconfigfileoperationspage.P $(DEPDIR)/gvconfigfullscreenpage.P $(DEPDIR)/gvconfigimagelistpage.P $(DEPDIR)/gvconfigimageviewpage.P $(DEPDIR)/gvconfigmiscpage.P $(DEPDIR)/gvbranchpropertiesdialogbase.P $(DEPDIR)/gvslideshowdialogbase.P $(DEPDIR)/gvexternaltooldialogbase.P $(DEPDIR)/gvprintdialogpagebase.P $(DEPDIR)/libgwenviewcore_la.all_cpp.P ./$(DEPDIR)/fileoperation.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/fileopobject.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvarchive.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvbatchmanipulator.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvbookmarkowner.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvbranchpropertiesdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvbusylevelmanager.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvcache.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvconfigdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvdirview.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvdocument.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvdocumentanimatedloadedimpl.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvdocumentdecodeimpl.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvdocumentimpl.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvdocumentjpegloadedimpl.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvdocumentloadedimpl.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvexternaltoolaction.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvexternaltoolcontext.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvexternaltooldialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvexternaltoolmanager.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvfiledetailview.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvfiledetailviewitem.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvfilethumbnailview.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvfilethumbnailviewitem.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvfileviewstack.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvfullscreenbar.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvhistory.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvimagesavedialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvjpegformattype.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvkipiinterface.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvmainwindow.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvmetaedit.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvpngformattype.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvprintdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvscrollpixmapview.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvscrollpixmapviewtools.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvslideshow.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvslideshowdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvthreadgate.Plo ./$(DEPDIR)/gvxpm.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo ./$(DEPDIR)/qxcfi.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/thumbnailloadjob.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/thumbnailsize.Plo
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/gvconfigfileoperationspage.P $(DEPDIR)/gvconfigfullscreenpage.P $(DEPDIR)/gvconfigimagelistpage.P $(DEPDIR)/gvconfigimageviewpage.P $(DEPDIR)/gvconfigmiscpage.P $(DEPDIR)/gvbranchpropertiesdialogbase.P $(DEPDIR)/gvslideshowdialogbase.P $(DEPDIR)/gvexternaltooldialogbase.P $(DEPDIR)/gvprintdialogpagebase.P ./$(DEPDIR)/fileoperation.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/fileopobject.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvarchive.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvbatchmanipulator.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvbookmarkowner.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvbranchpropertiesdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvbusylevelmanager.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvcache.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvconfigdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvdirview.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvdocument.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvdocumentanimatedloadedimpl.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvdocumentdecodeimpl.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvdocumentimpl.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvdocumentjpegloadedimpl.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvdocumentloadedimpl.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvexternaltoolaction.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvexternaltoolcontext.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvexternaltooldialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvexternaltoolmanager.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvfiledetailview.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvfiledetailviewitem.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvfilethumbnailview.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvfilethumbnailviewitem.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvfileviewstack.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvfullscreenbar.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvhistory.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvimagesavedialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvjpegformattype.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvkipiinterface.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvmainwindow.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvmetaedit.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvpngformattype.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvprintdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvscrollpixmapview.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvscrollpixmapviewtools.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvslideshow.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvslideshowdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gvthreadgate.Plo ./$(DEPDIR)/gvxpm.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo ./$(DEPDIR)/qxcfi.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/thumbnailloadjob.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/thumbnailsize.Plo
--#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 2
--CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
--#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--#>- $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
--#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(libgwenviewcore_la_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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--SOURCES = $(libgwenviewcore_la_SOURCES)
--
- #>- all: all-am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- all: docs-am all-am
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+#>- @for dep in $?; do \
@@ -59665,11 +65586,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/zh_TW/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu src/Makefile
+-#>- $(AUTOMAKE) --gnu translations/zh_TW/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign src/Makefile
++#>- $(AUTOMAKE) --foreign translations/zh_TW/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -59679,14 +65600,13 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/zh_TW/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu src/Makefile
-+ $(AUTOMAKE) --foreign src/Makefile
- cd $(top_srcdir) && perl admin/am_edit src/Makefile.in
+- $(AUTOMAKE) --gnu translations/zh_TW/Makefile
++ $(AUTOMAKE) --foreign translations/zh_TW/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/zh_TW/Makefile.in
-Makefile: $(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 \
@@ -59704,105 +65624,61 @@
+ 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) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-+ $(LIBTOOL) --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; \
-+ @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
- 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"; \
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
-@@ -676,7 +579,7 @@
- $(CXXLINK) -rpath $(libdir) $(libgwenviewcore_la_LDFLAGS) $(libgwenviewcore_la_OBJECTS) $(libgwenviewcore_la_LIBADD) $(LIBS)
- mostlyclean-compile:
-- -rm -f *.$(OBJEXT) core *.core
-+ -rm -f *.$(OBJEXT)
-
- distclean-compile:
- -rm -f *.tab.c
-@@ -727,37 +630,25 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/thumbnailsize.Plo at am__quote@
-
- .cpp.o:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
-- at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -769,14 +660,6 @@
- -rm -f libtool
- uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
@@ -59814,15 +65690,32 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -785,6 +668,7 @@
+@@ -418,19 +470,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
+tags: TAGS
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -796,10 +680,11 @@
+ 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; \
+@@ -440,10 +495,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -59836,9 +65729,9 @@
+ $$tags $$unique; \
+ fi
ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -822,12 +707,6 @@
+@@ -466,12 +522,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -59846,12 +65739,12 @@
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ..
+-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -841,7 +720,7 @@
+@@ -485,7 +535,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -59860,20 +65753,38 @@
else \
dir=''; \
fi; \
-@@ -859,9 +738,10 @@
- check-am: all-am
- check: check-am
- all-am: Makefile $(LTLIBRARIES)
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
-
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(libdir)
-+ for dir in "$(DESTDIR)$(libdir)"; do \
-+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ done
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -881,7 +761,7 @@
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,7 @@
clean-generic:
distclean-generic:
@@ -59882,194 +65793,484 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -906,6 +786,8 @@
+@@ -560,6 +611,8 @@
dvi-am:
-+html: html-am
++html: html-recursive
+
- info: info-am
+ info: info-recursive
info-am:
-@@ -943,8 +825,8 @@
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libLTLIBRARIES clean-libtool ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
-- distclean-tags distdir dvi dvi-am info info-am install \
-- install-am install-data install-data-am install-exec \
-+ distclean-tags distdir dvi dvi-am html html-am info info-am \
-+ install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am \
- install-libLTLIBRARIES install-man install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
-@@ -988,18 +870,18 @@
- mocs: gvdocument.moc
+@@ -594,37 +647,42 @@
- #>+ 3
--gvslideshowdialog.moc: $(srcdir)/gvslideshowdialog.h
-- $(MOC) $(srcdir)/gvslideshowdialog.h -o gvslideshowdialog.moc
-+gvmainwindow.moc: $(srcdir)/gvmainwindow.h
-+ $(MOC) $(srcdir)/gvmainwindow.h -o gvmainwindow.moc
+ uninstall-info: uninstall-info-recursive
- #>+ 2
--mocs: gvslideshowdialog.moc
-+mocs: gvmainwindow.moc
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
- #>+ 3
--gvmainwindow.moc: $(srcdir)/gvmainwindow.h
-- $(MOC) $(srcdir)/gvmainwindow.h -o gvmainwindow.moc
-+gvslideshowdialog.moc: $(srcdir)/gvslideshowdialog.h
-+ $(MOC) $(srcdir)/gvslideshowdialog.h -o gvslideshowdialog.moc
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
#>+ 2
--mocs: gvmainwindow.moc
-+mocs: gvslideshowdialog.moc
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
- #>+ 3
- gvbatchmanipulator.moc: $(srcdir)/gvbatchmanipulator.h
-@@ -1030,18 +912,18 @@
- mocs: gvprintdialog.moc
-
- #>+ 3
--gvdocumentjpegloadedimpl.moc: $(srcdir)/gvdocumentjpegloadedimpl.h
-- $(MOC) $(srcdir)/gvdocumentjpegloadedimpl.h -o gvdocumentjpegloadedimpl.moc
-+gvdocumentimpl.moc: $(srcdir)/gvdocumentimpl.h
-+ $(MOC) $(srcdir)/gvdocumentimpl.h -o gvdocumentimpl.moc
-
#>+ 2
--mocs: gvdocumentjpegloadedimpl.moc
-+mocs: gvdocumentimpl.moc
+ docs-am:
- #>+ 3
--gvdocumentimpl.moc: $(srcdir)/gvdocumentimpl.h
-- $(MOC) $(srcdir)/gvdocumentimpl.h -o gvdocumentimpl.moc
-+gvdocumentjpegloadedimpl.moc: $(srcdir)/gvdocumentjpegloadedimpl.h
-+ $(MOC) $(srcdir)/gvdocumentjpegloadedimpl.h -o gvdocumentjpegloadedimpl.moc
+-#>+ 6
++#>+ 15
+ force-reedit:
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/zh_TW/Makefile
++ @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) --foreign translations/zh_TW/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign translations/zh_TW/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/zh_TW/Makefile.in
- #>+ 2
--mocs: gvdocumentimpl.moc
-+mocs: gvdocumentjpegloadedimpl.moc
- #>+ 3
- gvfiledetailview.moc: $(srcdir)/gvfiledetailview.h
-@@ -1051,18 +933,18 @@
- mocs: gvfiledetailview.moc
+diff -Nru gwenview-1.3.0.orig/translations/zh_TW/messages/Makefile.in gwenview-1.3.0/translations/zh_TW/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/zh_TW/messages/Makefile.in 2005-09-11 10:40:32.000000000 -0400
++++ gwenview-1.3.0/translations/zh_TW/messages/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
+ # @configure_input@
- #>+ 3
--gvkipiinterface.moc: $(srcdir)/gvkipiinterface.h
-- $(MOC) $(srcdir)/gvkipiinterface.h -o gvkipiinterface.moc
-+gvdirview.moc: $(srcdir)/gvdirview.h
-+ $(MOC) $(srcdir)/gvdirview.h -o gvdirview.moc
+-# 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 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ 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
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = translations/zh_TW/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -164,6 +195,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +256,8 @@
+ 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@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -305,40 +342,53 @@
#>+ 2
--mocs: gvkipiinterface.moc
-+mocs: gvdirview.moc
+ POFILES = gwenview.po
+ GMOFILES = gwenview.gmo
+-subdir = translations/zh_TW/messages
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
+ all: all-nls docs-am all-recursive
- #>+ 3
--gvdirview.moc: $(srcdir)/gvdirview.h
-- $(MOC) $(srcdir)/gvdirview.h -o gvdirview.moc
-+gvkipiinterface.moc: $(srcdir)/gvkipiinterface.h
-+ $(MOC) $(srcdir)/gvkipiinterface.h -o gvkipiinterface.moc
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/zh_TW/messages/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu translations/zh_TW/messages/Makefile
+-#>+ 3
++#>- $(AUTOMAKE) --foreign translations/zh_TW/messages/Makefile
++#>+ 12
++ @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) --foreign translations/zh_TW/messages/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu translations/zh_TW/messages/Makefile
++ $(AUTOMAKE) --foreign translations/zh_TW/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/zh_TW/messages/Makefile.in
+-Makefile: $(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
- #>+ 2
--mocs: gvdirview.moc
-+mocs: gvkipiinterface.moc
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -357,7 +407,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 \
+@@ -369,7 +425,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -377,7 +433,13 @@
- #>+ 3
- gvhistory.moc: $(srcdir)/gvhistory.h
-@@ -1100,18 +982,18 @@
- mocs: gvfullscreenbar.moc
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -398,7 +460,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 \
+@@ -409,14 +471,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
- #>+ 3
--gvbranchpropertiesdialog.moc: $(srcdir)/gvbranchpropertiesdialog.h
-- $(MOC) $(srcdir)/gvbranchpropertiesdialog.h -o gvbranchpropertiesdialog.moc
-+gvdocumentloadedimpl.moc: $(srcdir)/gvdocumentloadedimpl.h
-+ $(MOC) $(srcdir)/gvdocumentloadedimpl.h -o gvdocumentloadedimpl.moc
+-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 \
+@@ -425,19 +479,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
++tags: TAGS
- #>+ 2
--mocs: gvbranchpropertiesdialog.moc
-+mocs: gvdocumentloadedimpl.moc
+ 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; \
+@@ -447,10 +504,11 @@
+ 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
+-
++ 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)
+@@ -473,14 +531,6 @@
- #>+ 3
--gvdocumentloadedimpl.moc: $(srcdir)/gvdocumentloadedimpl.h
-- $(MOC) $(srcdir)/gvdocumentloadedimpl.h -o gvdocumentloadedimpl.moc
-+gvbranchpropertiesdialog.moc: $(srcdir)/gvbranchpropertiesdialog.h
-+ $(MOC) $(srcdir)/gvbranchpropertiesdialog.h -o gvbranchpropertiesdialog.moc
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- #>+ 2
--mocs: gvdocumentloadedimpl.moc
-+mocs: gvbranchpropertiesdialog.moc
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -496,7 +546,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -511,15 +561,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -529,7 +581,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -551,7 +602,7 @@
+ clean-generic:
- #>+ 3
- gvfilethumbnailview.moc: $(srcdir)/gvfilethumbnailview.h
-@@ -1121,18 +1003,18 @@
- mocs: gvfilethumbnailview.moc
+ distclean-generic:
+- -rm -f $(CONFIG_CLEAN_FILES)
++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- #>+ 3
--gvmetaedit.moc: $(srcdir)/gvmetaedit.h
-- $(MOC) $(srcdir)/gvmetaedit.h -o gvmetaedit.moc
-+gvdocumentdecodeimpl.moc: $(srcdir)/gvdocumentdecodeimpl.h
-+ $(MOC) $(srcdir)/gvdocumentdecodeimpl.h -o gvdocumentdecodeimpl.moc
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -573,6 +624,8 @@
- #>+ 2
--mocs: gvmetaedit.moc
-+mocs: gvdocumentdecodeimpl.moc
+ dvi-am:
- #>+ 3
--gvdocumentdecodeimpl.moc: $(srcdir)/gvdocumentdecodeimpl.h
-- $(MOC) $(srcdir)/gvdocumentdecodeimpl.h -o gvdocumentdecodeimpl.moc
-+gvmetaedit.moc: $(srcdir)/gvmetaedit.h
-+ $(MOC) $(srcdir)/gvmetaedit.h -o gvmetaedit.moc
++html: html-recursive
++
+ info: info-recursive
- #>+ 2
--mocs: gvdocumentdecodeimpl.moc
-+mocs: gvmetaedit.moc
+ info-am:
+@@ -611,29 +664,25 @@
- #>+ 3
- gvfileviewstack.moc: $(srcdir)/gvfileviewstack.h
-@@ -1170,25 +1052,25 @@
- mocs: gvdocumentanimatedloadedimpl.moc
+ uninstall-info: uninstall-info-recursive
- #>+ 3
--gvbusylevelmanager.moc: $(srcdir)/gvbusylevelmanager.h
-- $(MOC) $(srcdir)/gvbusylevelmanager.h -o gvbusylevelmanager.moc
-+fileopobject.moc: $(srcdir)/fileopobject.h
-+ $(MOC) $(srcdir)/fileopobject.h -o fileopobject.moc
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
- #>+ 2
--mocs: gvbusylevelmanager.moc
-+mocs: fileopobject.moc
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
- #>+ 3
--fileopobject.moc: $(srcdir)/fileopobject.h
-- $(MOC) $(srcdir)/fileopobject.h -o fileopobject.moc
-+gvbusylevelmanager.moc: $(srcdir)/gvbusylevelmanager.h
-+ $(MOC) $(srcdir)/gvbusylevelmanager.h -o gvbusylevelmanager.moc
-
#>+ 2
--mocs: fileopobject.moc
-+mocs: gvbusylevelmanager.moc
+-KDE_DIST=gwenview.po Makefile.in
++KDE_DIST=gwenview.po Makefile.in Makefile.am
- #>+ 3
- clean-metasources:
-- -rm -f gvimagesavedialog.moc gvexternaltoolcontext.moc gvdocument.moc gvslideshowdialog.moc gvmainwindow.moc gvbatchmanipulator.moc gvthreadgate.moc gvexternaltoolaction.moc gvprintdialog.moc gvdocumentjpegloadedimpl.moc gvdocumentimpl.moc gvfiledetailview.moc gvkipiinterface.moc gvdirview.moc gvhistory.moc gvconfigdialog.moc thumbnailloadjob.moc gvexternaltooldialog.moc gvfullscreenbar.moc gvbranchpropertiesdialog.moc gvdocumentloadedimpl.moc gvfilethumbnailview.moc gvmetaedit.moc gvdocumentdecodeimpl.moc gvfileviewstack.moc gvscrollpixmapview.moc gvslideshow.moc gvbookmarkowner.moc gvdocumentanimatedloadedimpl.moc gvbusylevelmanager.moc fileopobject.moc
-+ -rm -f gvimagesavedialog.moc gvexternaltoolcontext.moc gvdocument.moc gvmainwindow.moc gvslideshowdialog.moc gvbatchmanipulator.moc gvthreadgate.moc gvexternaltoolaction.moc gvprintdialog.moc gvdocumentimpl.moc gvdocumentjpegloadedimpl.moc gvfiledetailview.moc gvdirview.moc gvkipiinterface.moc gvhistory.moc gvconfigdialog.moc thumbnailloadjob.moc gvexternaltooldialog.moc gvfullscreenbar.moc gvdocumentloadedimpl.moc gvbranchpropertiesdialog.moc gvfilethumbnailview.moc gvdocumentdecodeimpl.moc gvmetaedit.moc gvfileviewstack.moc gvscrollpixmapview.moc gvslideshow.moc gvbookmarkowner.moc gvdocumentanimatedloadedimpl.moc fileopobject.moc gvbusylevelmanager.moc
-
+ #>+ 4
+ gwenview.gmo: gwenview.po
+@@ -674,10 +723,19 @@
#>+ 2
--KDE_DIST=gvprintdialogpagebase.ui gvscrollpixmapview.h gvdocument.h gvexternaltoolmanager.h gvmainwindow.h gvdocumentjpegloadedimpl.h gvfileviewbase.h gvbatchmanipulator.h gvfileviewstack.h thumbnailsize.h gvxpm.h gvfiledetailview.h gvimagesavedialog.h gvslideshowdialog.h gvprintdialog.h gvdocumentdecodeimpl.h gvconfigimageviewpage.ui gvconfigmiscpage.ui gvscrollpixmapviewtools.h gvfullscreenbar.h gvslideshowdialogbase.ui gvdocumentloadedimpl.h thumbnailloadjob.h gvkipiinterface.h gvbusylevelmanager.h fileopobject.h gvbranchpropertiesdialogbase.ui gvmetaedit.h gvexternaltooldialog.h qxcfi.h gvdocumentanimatedloadedimpl.h fileoperation.h tags gvimageframe.h gvdocumentimpl.h gvconfigfullscreenpage.ui gvpngformattype.h gvbookmarkowner.h gvexternaltooldialogbase.ui gvcache.h gvarchive.h gvslideshow.h gvexternaltoolaction.h gvfilethumbnailviewitem.h gvdirview.h gvconfigdialog.h gvconfigfileoperationspage.ui gvhistory.h gvfiledetailviewitem.h gvexternaltoolcontext.h Makefile.in gvbranchpropertiesdialog.h gvfilethumbnailview.h gvconfigimagelistpage.ui gvthreadgate.h gvjpegformattype.h gimp.h
-+KDE_DIST=gvprintdialogpagebase.ui gvscrollpixmapview.h gvdocument.h gvexternaltoolmanager.h gvmainwindow.h gvdocumentjpegloadedimpl.h gvfileviewbase.h gvbatchmanipulator.h gvfileviewstack.h thumbnailsize.h gvxpm.h gvfiledetailview.h gvimagesavedialog.h gvslideshowdialog.h gvprintdialog.h gvdocumentdecodeimpl.h gvconfigimageviewpage.ui gvconfigmiscpage.ui gvscrollpixmapviewtools.h gvfullscreenbar.h gvslideshowdialogbase.ui gvdocumentloadedimpl.h thumbnailloadjob.h gvkipiinterface.h gvbusylevelmanager.h fileopobject.h gvbranchpropertiesdialogbase.ui gvmetaedit.h gvexternaltooldialog.h qxcfi.h fileoperation.h gvdocumentanimatedloadedimpl.h gvimageframe.h gvdocumentimpl.h gvconfigfullscreenpage.ui gvpngformattype.h gvexternaltooldialogbase.ui gvbookmarkowner.h gvcache.h gvarchive.h gvslideshow.h gvfilethumbnailviewitem.h gvexternaltoolaction.h gvdirview.h gvconfigdialog.h gvconfigfileoperationspage.ui gvhistory.h gvfiledetailviewitem.h gvexternaltoolcontext.h gvbranchpropertiesdialog.h Makefile.in gvfilethumbnailview.h gvconfigimagelistpage.ui gvthreadgate.h gvjpegformattype.h Makefile.am gimp.h
-
- #>+ 12
- clean-ui:
-@@ -1210,10 +1092,19 @@
- #>+ 2
docs-am:
-#>+ 6
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu src/Makefile
+- $(AUTOMAKE) --gnu translations/zh_TW/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -60078,28 +66279,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/zh_TW/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign src/Makefile
- cd $(top_srcdir) && perl admin/am_edit src/Makefile.in
++ $(AUTOMAKE) --foreign translations/zh_TW/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/zh_TW/messages/Makefile.in
-@@ -1240,7 +1131,7 @@
-
-
- #>+ 11
--libgwenviewcore_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/thumbnailsize.cpp $(srcdir)/thumbnailloadjob.cpp $(srcdir)/gvscrollpixmapview.cpp $(srcdir)/gvprintdialog.cpp $(srcdir)/gvbatchmanipulator.cpp $(srcdir)/gvmainwindow.cpp $(srcdir)/gvdocument.cpp $(srcdir)/gvdirview.cpp $(srcdir)/gvfileviewstack.cpp $(srcdir)/gvfilethumbnailview.cpp $(srcdir)/fileoperation.cpp $(srcdir)/gvconfigdialog.cpp $(srcdir)/gvbranchpropertiesdialog.cpp $(srcdir)/fileopobject.cpp $(srcdir)/gvfilethumbnailviewitem.cpp $(srcdir)/qxcfi.cpp $(srcdir)/gvarchive.cpp $(srcdir)/gvslideshow.cpp $(srcdir)/gvfiledetailview.cpp $(srcdir)/gvfiledetailviewitem.cpp $(srcdir)/gvbookmarkowner.cpp $(srcdir)/gvimagesavedialog.cpp $(srcdir)/gvslideshowdialog.cpp $(srcdir)/gvmetaedit.cpp $(srcdir)/gvexternaltoolmanager.cpp $(srcdir)/gvexternaltoolcontext.cpp $(srcdir)/gvexternaltoolaction.cpp $(srcdir)/gvexternaltooldialog.cpp $(srcdir)/gvhistory.cpp $(srcdir)/gvjpegformattype.cpp $(srcdir)/gvpngformattype.cpp $(srcdir)/gvxpm.cpp $(srcdir)/gvdocumentimpl.cpp $(srcdir)/gvdocumentdecodeimpl.cpp $(srcdir)/gvdocumentloadedimpl.cpp $(srcdir)/gvdocumentjpegloadedimpl.cpp $(srcdir)/gvdocumentanimatedloadedimpl.cpp $(srcdir)/gvkipiinterface.cpp $(srcdir)/gvbusylevelmanager.cpp $(srcdir)/gvcache.cpp $(srcdir)/gvthreadgate.cpp $(srcdir)/gvscrollpixmapviewtools.cpp $(srcdir)/gvfullscreenbar.cpp $(srcdir)/main.cpp gvconfigfileoperationspage.cpp gvconfigfullscreenpage.cpp gvconfigimagelistpage.cpp gvconfigimageviewpage.cpp gvconfigmiscpage.cpp gvbranchpropertiesdialogbase.cpp gvslideshowdialogbase.cpp gvexternaltooldialogbase.cpp gvprintdialogpagebase.cpp gvconfigimageviewpage.moc gvbatchmanipulator.moc gvmainwindow.moc gvexternaltoolaction.moc gvdocumentjpegloadedimpl.moc gvfiledetailview.moc gvslideshowdialogbase.moc gvdirview.moc gvkipiinterface.moc gvconfigmiscpage.moc gvhistory.moc gvexternaltooldialogbase.moc thumbnailloadjob.moc gvexternaltooldialog.moc gvfullscreenbar.moc gvfilethumbnailview.moc gvdocumentdecodeimpl.moc gvconfigfileoperationspage.moc gvslideshow.moc gvdocumentanimatedloadedimpl.moc fileopobject.moc gvbusylevelmanager.moc gvimagesavedialog.moc gvexternaltoolcontext.moc gvdocument.moc gvslideshowdialog.moc gvprintdialogpagebase.moc gvthreadgate.moc gvprintdialog.moc gvdocumentimpl.moc gvconfigdialog.moc gvbranchpropertiesdialogbase.moc gvconfigimagelistpage.moc gvbranchpropertiesdialog.moc gvdocumentloadedimpl.moc gvmetaedit.moc gvconfigfullscreenpage.moc gvscrollpixmapview.moc gvfileviewstack.moc gvbookmarkowner.moc
-+libgwenviewcore_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/thumbnailsize.cpp $(srcdir)/thumbnailloadjob.cpp $(srcdir)/gvscrollpixmapview.cpp $(srcdir)/gvprintdialog.cpp $(srcdir)/gvbatchmanipulator.cpp $(srcdir)/gvmainwindow.cpp $(srcdir)/gvdocument.cpp $(srcdir)/gvdirview.cpp $(srcdir)/gvfileviewstack.cpp $(srcdir)/gvfilethumbnailview.cpp $(srcdir)/fileoperation.cpp $(srcdir)/gvconfigdialog.cpp $(srcdir)/gvbranchpropertiesdialog.cpp $(srcdir)/fileopobject.cpp $(srcdir)/gvfilethumbnailviewitem.cpp $(srcdir)/qxcfi.cpp $(srcdir)/gvarchive.cpp $(srcdir)/gvslideshow.cpp $(srcdir)/gvfiledetailview.cpp $(srcdir)/gvfiledetailviewitem.cpp $(srcdir)/gvbookmarkowner.cpp $(srcdir)/gvimagesavedialog.cpp $(srcdir)/gvslideshowdialog.cpp $(srcdir)/gvmetaedit.cpp $(srcdir)/gvexternaltoolmanager.cpp $(srcdir)/gvexternaltoolcontext.cpp $(srcdir)/gvexternaltoolaction.cpp $(srcdir)/gvexternaltooldialog.cpp $(srcdir)/gvhistory.cpp $(srcdir)/gvjpegformattype.cpp $(srcdir)/gvpngformattype.cpp $(srcdir)/gvxpm.cpp $(srcdir)/gvdocumentimpl.cpp $(srcdir)/gvdocumentdecodeimpl.cpp $(srcdir)/gvdocumentloadedimpl.cpp $(srcdir)/gvdocumentjpegloadedimpl.cpp $(srcdir)/gvdocumentanimatedloadedimpl.cpp $(srcdir)/gvkipiinterface.cpp $(srcdir)/gvbusylevelmanager.cpp $(srcdir)/gvcache.cpp $(srcdir)/gvthreadgate.cpp $(srcdir)/gvscrollpixmapviewtools.cpp $(srcdir)/gvfullscreenbar.cpp $(srcdir)/main.cpp gvconfigfileoperationspage.cpp gvconfigfullscreenpage.cpp gvconfigimagelistpage.cpp gvconfigimageviewpage.cpp gvconfigmiscpage.cpp gvbranchpropertiesdialogbase.cpp gvslideshowdialogbase.cpp gvexternaltooldialogbase.cpp gvprintdialogpagebase.cpp gvconfigimageviewpage.moc gvbatchmanipulator.moc gvmainwindow.moc gvexternaltoolaction.moc gvdocumentjpegloadedimpl.moc gvfiledetailview.moc gvslideshowdialogbase.moc gvkipiinterface.moc gvdirview.moc gvconfigmiscpage.moc gvhistory.moc gvexternaltooldialogbase.moc thumbnailloadjob.moc gvexternaltooldialog.moc gvfullscreenbar.moc gvfilethumbnailview.moc gvdocumentdecodeimpl.moc gvconfigfileoperationspage.moc gvslideshow.moc gvdocumentanimatedloadedimpl.moc gvbusylevelmanager.moc fileopobject.moc gvimagesavedialog.moc gvexternaltoolcontext.moc gvdocument.moc gvslideshowdialog.moc gvprintdialogpagebase.moc gvthreadgate.moc gvprintdialog.moc gvdocumentimpl.moc gvconfigdialog.moc gvbranchpropertiesdialogbase.moc gvconfigimagelistpage.moc gvdocumentloadedimpl.moc gvbranchpropertiesdialog.moc gvmetaedit.moc gvconfigfullscreenpage.moc gvscrollpixmapview.moc gvfileviewstack.moc gvbookmarkowner.moc
- @echo 'creating libgwenviewcore_la.all_cpp.cpp ...'; \
- rm -f libgwenviewcore_la.all_cpp.files libgwenviewcore_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libgwenviewcore_la.all_cpp.final; \
-diff -Nru gwenview-1.2.0.orig/tools/Makefile.in gwenview-1.2.0/tools/Makefile.in
---- gwenview-1.2.0.orig/tools/Makefile.in 2005-04-03 13:19:04.000000000 +0000
-+++ gwenview-1.2.0/tools/Makefile.in 2005-07-26 19:28:14.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/zu/Makefile.in gwenview-1.3.0/translations/zu/Makefile.in
+--- gwenview-1.3.0.orig/translations/zu/Makefile.in 2005-09-11 10:40:32.000000000 -0400
++++ gwenview-1.3.0/translations/zu/Makefile.in 2005-09-12 08:43:49.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -60109,19 +66301,27 @@
# 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.
-@@ -22,7 +22,6 @@
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
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
-@@ -39,6 +38,30 @@
+@@ -39,6 +37,37 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = tools
++subdir = translations/zu
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -60133,30 +66333,29 @@
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_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)$(toolsdir)"
-+toolsDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(tools_DATA)
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- html-recursive info-recursive install-data-recursive \
++#>- install-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +134,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +173,9 @@
+@@ -164,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -60166,7 +66365,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +232,8 @@
+@@ -222,6 +254,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -60175,79 +66374,41 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +241,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +279,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +307,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -302,29 +306,53 @@
- tools_DATA = gimp.desktop wallpaper.desktop tiledwallpaper.desktop \
- konqueror.desktop
-
--subdir = tools
+@@ -298,40 +333,53 @@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ SUBDIRS = messages
+-subdir = translations/zu
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
--DATA = $(tools_DATA)
-
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
- #>- all: all-am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- all: docs-am all-am
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
@@ -60260,11 +66421,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tools/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/zu/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu tools/Makefile
+-#>- $(AUTOMAKE) --gnu translations/zu/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign tools/Makefile
++#>- $(AUTOMAKE) --foreign translations/zu/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -60274,11 +66435,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tools/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/zu/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu tools/Makefile
-+ $(AUTOMAKE) --foreign tools/Makefile
- cd $(top_srcdir) && perl admin/am_edit tools/Makefile.in
+- $(AUTOMAKE) --gnu translations/zu/Makefile
++ $(AUTOMAKE) --foreign translations/zu/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/zu/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -60301,51 +66462,124 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -335,23 +363,22 @@
- distclean-libtool:
- -rm -f libtool
- uninstall-info-am:
--toolsDATA_INSTALL = $(INSTALL_DATA)
- install-toolsDATA: $(tools_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(toolsdir)
-+ test -z "$(toolsdir)" || $(mkdir_p) "$(DESTDIR)$(toolsdir)"
- @list='$(tools_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(toolsDATA_INSTALL) $$d$$p $(DESTDIR)$(toolsdir)/$$f"; \
-- $(toolsDATA_INSTALL) $$d$$p $(DESTDIR)$(toolsdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(toolsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(toolsdir)/$$f'"; \
-+ $(toolsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(toolsdir)/$$f"; \
+@@ -350,7 +398,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 \
+@@ -362,7 +416,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -370,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -391,7 +451,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 \
+@@ -402,14 +462,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
- uninstall-toolsDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(tools_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(toolsdir)/$$f"; \
-- rm -f $(DESTDIR)$(toolsdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(toolsdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(toolsdir)/$$f"; \
- done
- tags: TAGS
- TAGS:
-@@ -359,12 +386,6 @@
+-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 \
+@@ -418,19 +470,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { 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; \
+@@ -440,10 +495,11 @@
+ 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
+-
++ 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: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -466,12 +522,6 @@
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ..
+-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -378,7 +399,7 @@
+@@ -485,7 +535,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -60354,20 +66588,38 @@
else \
dir=''; \
fi; \
-@@ -396,9 +417,10 @@
- check-am: all-am
- check: check-am
- all-am: Makefile $(DATA)
+@@ -500,15 +550,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -518,7 +570,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
-
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(toolsdir)
-+ for dir in "$(DESTDIR)$(toolsdir)"; do \
-+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ done
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -418,7 +440,7 @@
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -538,7 +589,7 @@
clean-generic:
distclean-generic:
@@ -60376,41 +66628,54 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -439,6 +461,8 @@
+@@ -560,6 +611,8 @@
dvi-am:
-+html: html-am
++html: html-recursive
+
- info: info-am
+ info: info-recursive
info-am:
-@@ -473,28 +497,37 @@
+@@ -594,37 +647,42 @@
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
-- dvi-am info info-am install install-am install-data \
-- install-data-am install-exec install-exec-am install-info \
-- install-info-am install-man install-strip install-toolsDATA \
-- installcheck installcheck-am installdirs maintainer-clean \
-- maintainer-clean-generic mostlyclean mostlyclean-generic \
-- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-- uninstall-info-am uninstall-toolsDATA
-+ dvi-am html html-am info info-am install install-am \
-+ install-data install-data-am install-exec install-exec-am \
-+ install-info install-info-am install-man install-strip \
-+ install-toolsDATA installcheck installcheck-am installdirs \
-+ maintainer-clean maintainer-clean-generic mostlyclean \
-+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+ uninstall uninstall-am uninstall-info-am uninstall-toolsDATA
+ uninstall-info: uninstall-info-recursive
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
#>+ 2
--KDE_DIST=wallpaper.desktop tiledwallpaper.desktop gimp.desktop konqueror.desktop Makefile.in
-+KDE_DIST=wallpaper.desktop tiledwallpaper.desktop gimp.desktop Makefile.in konqueror.desktop Makefile.am
+-KDE_DIST=Makefile.in
++KDE_DIST=Makefile.in Makefile.am
#>+ 2
docs-am:
@@ -60419,7 +66684,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu tools/Makefile
+- $(AUTOMAKE) --gnu translations/zu/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -60428,19 +66693,19 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tools/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/zu/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign tools/Makefile
- cd $(top_srcdir) && perl admin/am_edit tools/Makefile.in
++ $(AUTOMAKE) --foreign translations/zu/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/zu/Makefile.in
-diff -Nru gwenview-1.2.0.orig/tsthread/Makefile.in gwenview-1.2.0/tsthread/Makefile.in
---- gwenview-1.2.0.orig/tsthread/Makefile.in 2005-04-03 13:19:04.000000000 +0000
-+++ gwenview-1.2.0/tsthread/Makefile.in 2005-07-26 19:28:14.000000000 +0000
+diff -Nru gwenview-1.3.0.orig/translations/zu/messages/Makefile.in gwenview-1.3.0/translations/zu/messages/Makefile.in
+--- gwenview-1.3.0.orig/translations/zu/messages/Makefile.in 2005-09-11 10:40:32.000000000 -0400
++++ gwenview-1.3.0/translations/zu/messages/Makefile.in 2005-09-12 08:43:49.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 409359 $
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -60450,31 +66715,28 @@
# 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,6 +15,9 @@
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
@SET_MAKE@
-
-+
-+SOURCES = $(libtsthread_la_SOURCES)
-+
+-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -22,7 +25,6 @@
+@@ -22,7 +21,6 @@
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
-@@ -39,6 +41,55 @@
+@@ -39,6 +37,39 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-+subdir = tsthread
-+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-+ $(srcdir)/Makefile.in
++subdir = translations/zu/messages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.in
@@ -60483,56 +66745,33 @@
+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
-+LTLIBRARIES = $(noinst_LTLIBRARIES)
-+libtsthread_la_LIBADD =
-+am_libtsthread_la_OBJECTS = tsthread.lo tswaitcondition.lo
-+#>- libtsthread_la_OBJECTS = $(am_libtsthread_la_OBJECTS)
-+#>+ 4
-+libtsthread_la_final_OBJECTS = libtsthread_la.all_cpp.lo
-+libtsthread_la_nofinal_OBJECTS = tsthread.lo tswaitcondition.lo
-+ at KDE_USE_FINAL_FALSE@libtsthread_la_OBJECTS = $(libtsthread_la_nofinal_OBJECTS)
-+ at KDE_USE_FINAL_TRUE@libtsthread_la_OBJECTS = $(libtsthread_la_final_OBJECTS)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-+am__depfiles_maybe = depfiles
-+#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 2
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+#>- $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 3
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+CXXLD = $(CXX)
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>+ 2
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libtsthread_la_SOURCES)
-+DIST_SOURCES = $(libtsthread_la_SOURCES)
-+HEADERS = $(noinst_HEADERS)
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- html-recursive info-recursive install-data-recursive \
++#>- install-exec-recursive install-info-recursive \
++#>- install-recursive installcheck-recursive installdirs-recursive \
++#>- pdf-recursive ps-recursive uninstall-info-recursive \
++#>- uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive nmcheck-recursive bcheck-recursive
+ETAGS = etags
+CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
-@@ -111,6 +162,7 @@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
- LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
- LIBPNG = @LIBPNG@
- LIBPTHREAD = @LIBPTHREAD@
- LIBRESOLV = @LIBRESOLV@
-@@ -149,6 +201,9 @@
+@@ -164,6 +195,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -60542,7 +66781,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -205,6 +260,8 @@
+@@ -222,6 +256,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -60551,137 +66790,43 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -212,19 +269,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--desktopfiles_SUBDIR_included_FALSE = @desktopfiles_SUBDIR_included_FALSE@
--desktopfiles_SUBDIR_included_TRUE = @desktopfiles_SUBDIR_included_TRUE@
--doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
--doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
--gvdirpart_SUBDIR_included_FALSE = @gvdirpart_SUBDIR_included_FALSE@
--gvdirpart_SUBDIR_included_TRUE = @gvdirpart_SUBDIR_included_TRUE@
--gvimagepart_SUBDIR_included_FALSE = @gvimagepart_SUBDIR_included_FALSE@
--gvimagepart_SUBDIR_included_TRUE = @gvimagepart_SUBDIR_included_TRUE@
--gvimageutils_SUBDIR_included_FALSE = @gvimageutils_SUBDIR_included_FALSE@
--gvimageutils_SUBDIR_included_TRUE = @gvimageutils_SUBDIR_included_TRUE@
--gwenviewapp_SUBDIR_included_FALSE = @gwenviewapp_SUBDIR_included_FALSE@
--gwenviewapp_SUBDIR_included_TRUE = @gwenviewapp_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -262,35 +307,22 @@
- kdeinitdir = @kdeinitdir@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libgvcompat_SUBDIR_included_FALSE = @libgvcompat_SUBDIR_included_FALSE@
--libgvcompat_SUBDIR_included_TRUE = @libgvcompat_SUBDIR_included_TRUE@
--libgvexif_SUBDIR_included_FALSE = @libgvexif_SUBDIR_included_FALSE@
--libgvexif_SUBDIR_included_TRUE = @libgvexif_SUBDIR_included_TRUE@
+@@ -273,6 +309,7 @@
+ libexif_internal_TRUE = @libexif_internal_TRUE@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
--po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
--po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
prefix = @prefix@
program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--src_SUBDIR_included_FALSE = @src_SUBDIR_included_FALSE@
--src_SUBDIR_included_TRUE = @src_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--tools_SUBDIR_included_FALSE = @tools_SUBDIR_included_FALSE@
--tools_SUBDIR_included_TRUE = @tools_SUBDIR_included_TRUE@
--tsthread_SUBDIR_included_FALSE = @tsthread_SUBDIR_included_FALSE@
--tsthread_SUBDIR_included_TRUE = @tsthread_SUBDIR_included_TRUE@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
- x_includes = @x_includes@
-@@ -299,91 +331,69 @@
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
- INCLUDES = -I$(srcdir) -I$(srcdir)/.. $(all_includes)
--
- noinst_LTLIBRARIES = libtsthread.la
--
- libtsthread_la_SOURCES = \
- tsthread.cpp \
- tswaitcondition.cpp
-
--
- noinst_HEADERS = \
- tsthread.h
-
--
- #>- METASOURCES = AUTO
--subdir = tsthread
+@@ -305,40 +342,53 @@
+ #>+ 2
+ POFILES = gwenview.po
+ GMOFILES = gwenview.gmo
+-subdir = translations/zu/messages
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
--LTLIBRARIES = $(noinst_LTLIBRARIES)
+-DIST_SOURCES =
-
--libtsthread_la_LDFLAGS =
--libtsthread_la_LIBADD =
--am_libtsthread_la_OBJECTS = tsthread.lo tswaitcondition.lo
--#>- libtsthread_la_OBJECTS = $(am_libtsthread_la_OBJECTS)
--#>+ 4
--libtsthread_la_final_OBJECTS = libtsthread_la.all_cpp.lo
--libtsthread_la_nofinal_OBJECTS = tsthread.lo tswaitcondition.lo
-- at KDE_USE_FINAL_FALSE@libtsthread_la_OBJECTS = $(libtsthread_la_nofinal_OBJECTS)
-- at KDE_USE_FINAL_TRUE@libtsthread_la_OBJECTS = $(libtsthread_la_final_OBJECTS)
--
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
--depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--am__depfiles_maybe = depfiles
--#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/tsthread.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/tswaitcondition.Plo
--#>+ 4
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libtsthread_la.all_cpp.P ./$(DEPDIR)/tsthread.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/tswaitcondition.Plo
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/tsthread.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/tswaitcondition.Plo
--#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 2
--CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
--#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--#>- $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
--#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(libtsthread_la_SOURCES)
--HEADERS = $(noinst_HEADERS)
--
--DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in Makefile.am
--SOURCES = $(libtsthread_la_SOURCES)
--
- #>- all: all-am
+-#>- 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
+-#>+ 5
+-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 nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
#>+ 1
- all: docs-am all-am
+ all: all-nls docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+#>- @for dep in $?; do \
@@ -60692,11 +66837,11 @@
+#>- exit 1;; \
+#>- esac; \
+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tsthread/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/zu/messages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu tsthread/Makefile
+-#>- $(AUTOMAKE) --gnu translations/zu/messages/Makefile
-#>+ 3
-+#>- $(AUTOMAKE) --foreign tsthread/Makefile
++#>- $(AUTOMAKE) --foreign translations/zu/messages/Makefile
+#>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
@@ -60706,11 +66851,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tsthread/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/zu/messages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu tsthread/Makefile
-+ $(AUTOMAKE) --foreign tsthread/Makefile
- cd $(top_srcdir) && perl admin/am_edit tsthread/Makefile.in
+- $(AUTOMAKE) --gnu translations/zu/messages/Makefile
++ $(AUTOMAKE) --foreign translations/zu/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/zu/messages/Makefile.in
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -60731,78 +66876,60 @@
+$(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
-@@ -391,7 +401,7 @@
- $(CXXLINK) $(libtsthread_la_LDFLAGS) $(libtsthread_la_OBJECTS) $(libtsthread_la_LIBADD) $(LIBS)
-
- mostlyclean-compile:
-- -rm -f *.$(OBJEXT) core *.core
-+ -rm -f *.$(OBJEXT)
-
- distclean-compile:
- -rm -f *.tab.c
-@@ -400,37 +410,25 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tswaitcondition.Plo at am__quote@
-
- .cpp.o:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
-- at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
mostlyclean-libtool:
-rm -f *.lo
-@@ -442,14 +440,6 @@
- -rm -f libtool
- uninstall-info-am:
+@@ -357,7 +407,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 \
+@@ -369,7 +425,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; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -377,7 +433,13 @@
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @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; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -398,7 +460,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 \
+@@ -409,14 +471,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
-ETAGS = etags
-ETAGSFLAGS =
-
@@ -60814,15 +66941,32 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -458,6 +448,7 @@
+@@ -425,19 +479,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
+tags: TAGS
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -469,10 +460,11 @@
+ 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; \
+@@ -447,10 +504,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
@@ -60836,22 +66980,24 @@
+ $$tags $$unique; \
+ fi
ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -495,12 +487,6 @@
+@@ -473,14 +531,6 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
--top_distdir = ..
+-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -514,7 +500,7 @@
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -496,7 +546,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
@@ -60860,15 +67006,38 @@
else \
dir=''; \
fi; \
-@@ -532,7 +518,6 @@
- check-am: all-am
- check: check-am
- all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+@@ -511,15 +561,17 @@
+ || 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" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -529,7 +581,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
-
- installdirs:
- install: install-am
- install-exec: install-exec-am
-@@ -553,7 +538,7 @@
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -551,7 +602,7 @@
clean-generic:
distclean-generic:
@@ -60877,41 +67046,58 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -578,6 +563,8 @@
+@@ -573,6 +624,8 @@
dvi-am:
-+html: html-am
++html: html-recursive
+
- info: info-am
+ info: info-recursive
info-am:
-@@ -615,13 +602,14 @@
- .PHONY: CTAGS GTAGS all all-am check check-am 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 \
-+ distclean-tags distdir dvi dvi-am html html-am info info-am \
-+ install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
-- mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
-- pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am
-+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-+ pdf pdf-am ps ps-am tags uninstall uninstall-am \
-+ uninstall-info-am
+@@ -611,29 +664,25 @@
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-data install-data-am install-data-recursive \
+- 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
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
++ html-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 installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-@@ -639,15 +627,24 @@
- -rm -f tsthread.moc
+ .NOEXPORT:
#>+ 2
--KDE_DIST=tswaitcondition.h Makefile.in
-+KDE_DIST=tswaitcondition.h Makefile.in Makefile.am
+-KDE_DIST=gwenview.po Makefile.in
++KDE_DIST=gwenview.po Makefile.in Makefile.am
+ #>+ 4
+ gwenview.gmo: gwenview.po
+@@ -674,10 +723,19 @@
#>+ 2
docs-am:
@@ -60919,7 +67105,7 @@
+#>+ 15
force-reedit:
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu tsthread/Makefile
+- $(AUTOMAKE) --gnu translations/zu/messages/Makefile
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
@@ -60928,9 +67114,9 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tsthread/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign translations/zu/messages/Makefile'; \
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign tsthread/Makefile
- cd $(top_srcdir) && perl admin/am_edit tsthread/Makefile.in
++ $(AUTOMAKE) --foreign translations/zu/messages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit translations/zu/messages/Makefile.in
More information about the pkg-kde-commits
mailing list