[Pkg-kde-commits] rev 852 - branches/kde-3.4.0/packages/kdebase/debian/patches
Christopher Martin
chrsmrtn-guest@costa.debian.org
Fri, 18 Mar 2005 20:46:02 +0100
Author: chrsmrtn-guest
Date: 2005-03-18 20:45:57 +0100 (Fri, 18 Mar 2005)
New Revision: 852
Modified:
branches/kde-3.4.0/packages/kdebase/debian/patches/98_buildprep.diff
Log:
Updated buildprep.diff for kdebase.
Modified: branches/kde-3.4.0/packages/kdebase/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/98_buildprep.diff 2005-03-18 19:40:37 UTC (rev 851)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/98_buildprep.diff 2005-03-18 19:45:57 UTC (rev 852)
@@ -1,11 +1,11 @@
-#DPATCHLEVEL=1
diff -Nrua kdebase-3.4.0.orig/Makefile.in kdebase-3.4.0/Makefile.in
--- kdebase-3.4.0.orig/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/Makefile.in 2005-03-04 19:44:14.000000000 -0500
++++ kdebase-3.4.0/Makefile.in 2005-03-18 14:34:05.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -114,9 +114,18 @@
#>+ 2
docs-am:
+@@ -1264,7 +1279,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/acinclude.m4 kdebase-3.4.0/acinclude.m4
--- kdebase-3.4.0.orig/acinclude.m4 2005-03-04 08:11:03.000000000 -0500
-+++ kdebase-3.4.0/acinclude.m4 2005-03-04 19:36:03.000000000 -0500
++++ kdebase-3.4.0/acinclude.m4 2005-03-18 14:26:44.000000000 -0500
@@ -1682,15 +1682,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
@@ -143,7 +152,70 @@
AC_TRY_COMPILE([
$2
],
-@@ -5686,6 +5674,7 @@
+@@ -3194,6 +3182,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 */
++ template<typename CharT>
++ struct VisTest
++ {
++ inline VisTest ();
++ };
++ template<typename CharT>
++ inline VisTest<CharT>::VisTest()
++ {}
++ extern template class VisTest<char>; // It works if we drop that line
++ int some_function( int do_something ) __attribute__ ((visibility("default")));
++ int some_function( int )
++ {
++ VisTest<char> a;
++ 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
+@@ -3202,7 +3235,9 @@
+ 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])
+ ])
+@@ -5686,6 +5721,7 @@
## the same distribution terms that you use for the rest of that program.
# serial 47 AC_PROG_LIBTOOL
@@ -151,7 +223,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -5745,7 +5734,7 @@
+@@ -5745,7 +5781,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -160,7 +232,7 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -6159,12 +6148,11 @@
+@@ -6159,12 +6195,11 @@
if AC_TRY_EVAL(ac_compile); then
case "`/usr/bin/file conftest.o`" in
*32-bit*)
@@ -174,7 +246,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -6176,7 +6164,6 @@
+@@ -6176,7 +6211,6 @@
esac
;;
*64-bit*)
@@ -182,7 +254,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -6306,7 +6293,7 @@
+@@ -6306,7 +6340,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
@@ -191,7 +263,7 @@
case $build_os in
msdosdjgpp*)
-@@ -6335,20 +6322,26 @@
+@@ -6335,20 +6369,26 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -223,7 +295,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 @@
+@@ -6498,7 +6538,7 @@
lt_cv_dlopen_self=yes
])
;;
@@ -232,7 +304,7 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -6587,13 +6580,6 @@
+@@ -6587,13 +6627,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -246,7 +318,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 @@
+@@ -6617,8 +6650,11 @@
fi
fi
chmod u+w .
@@ -260,7 +332,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -6735,7 +6724,7 @@
+@@ -6735,7 +6771,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -269,7 +341,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -6748,7 +6737,7 @@
+@@ -6748,7 +6784,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -278,7 +350,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -6758,7 +6747,20 @@
+@@ -6758,7 +6794,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -300,7 +372,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -6823,7 +6825,7 @@
+@@ -6823,7 +6872,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -309,7 +381,7 @@
;;
beos*)
-@@ -6848,7 +6850,7 @@
+@@ -6848,7 +6897,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -318,7 +390,7 @@
need_version=no
need_lib_prefix=no
-@@ -6913,7 +6915,7 @@
+@@ -6913,7 +6962,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -327,7 +399,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 @@
+@@ -6936,7 +6985,7 @@
dynamic_linker=no
;;
@@ -336,7 +408,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -6996,7 +6998,7 @@
+@@ -6996,7 +7045,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -345,7 +417,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -7011,7 +7013,7 @@
+@@ -7011,7 +7060,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -354,7 +426,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 @@
+@@ -7022,7 +7071,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -363,7 +435,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 @@
+@@ -7084,22 +7133,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'
@@ -392,7 +464,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 @@
+@@ -7109,6 +7155,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -423,7 +495,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -7118,7 +7141,7 @@
+@@ -7118,7 +7188,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -432,7 +504,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -7147,7 +7170,7 @@
+@@ -7147,7 +7217,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -441,7 +513,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 @@
+@@ -7167,7 +7237,7 @@
os2*)
libname_spec='$name'
@@ -450,7 +522,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -7758,31 +7781,23 @@
+@@ -7758,31 +7828,23 @@
;;
cygwin*)
@@ -491,7 +563,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -7821,42 +7836,21 @@
+@@ -7821,42 +7883,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -541,7 +613,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 @@
+@@ -7885,9 +7926,6 @@
;;
osf3* | osf4* | osf5*)
@@ -551,7 +623,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7897,7 +7888,6 @@
+@@ -7897,7 +7935,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -559,7 +631,7 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -8163,7 +8153,7 @@
+@@ -8163,7 +8200,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])
@@ -568,7 +640,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 @@
+@@ -8213,7 +8250,7 @@
fi
;;
@@ -577,7 +649,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -8223,29 +8213,29 @@
+@@ -8223,29 +8260,29 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -621,7 +693,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 @@
+@@ -8253,8 +8290,8 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -632,7 +704,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -8362,8 +8352,8 @@
+@@ -8362,8 +8399,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
@@ -643,7 +715,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 @@
+@@ -8389,7 +8426,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.
@@ -652,7 +724,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -8419,8 +8409,22 @@
+@@ -8419,8 +8456,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -677,7 +749,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -8466,15 +8470,16 @@
+@@ -8466,15 +8517,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -698,7 +770,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 @@
+@@ -8483,13 +8535,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -714,7 +786,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -8504,7 +8508,7 @@
+@@ -8504,7 +8555,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.
@@ -723,7 +795,7 @@
fi
fi
;;
-@@ -8521,12 +8525,12 @@
+@@ -8521,12 +8572,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'
@@ -738,7 +810,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 @@
+@@ -8535,7 +8586,7 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -747,7 +819,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -8546,20 +8550,20 @@
+@@ -8546,20 +8597,20 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -778,7 +850,7 @@
fi
;;
esac
-@@ -8569,19 +8573,19 @@
+@@ -8569,19 +8620,19 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -804,7 +876,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 @@
+@@ -8616,7 +8667,7 @@
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
@@ -813,7 +885,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 @@
+@@ -8638,7 +8689,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
aCC)
@@ -822,7 +894,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 @@
+@@ -8647,11 +8698,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.
@@ -836,7 +908,7 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8708,7 +8712,7 @@
+@@ -8708,7 +8759,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -845,7 +917,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -8729,7 +8733,7 @@
+@@ -8729,7 +8780,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -854,7 +926,7 @@
;;
esac
fi
-@@ -8744,7 +8748,7 @@
+@@ -8744,7 +8795,7 @@
case $cc_basename in
CC)
# SGI C++
@@ -863,7 +935,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 @@
+@@ -8755,9 +8806,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -875,7 +947,7 @@
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -8774,8 +8778,8 @@
+@@ -8774,8 +8825,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.
@@ -886,7 +958,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 @@
+@@ -8797,16 +8848,16 @@
# Intel C++
with_gnu_ld=yes
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -907,7 +979,7 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8844,7 +8848,7 @@
+@@ -8844,7 +8895,7 @@
;;
esac
;;
@@ -916,7 +988,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 @@
+@@ -8863,7 +8914,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.
@@ -925,7 +997,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8880,7 +8884,7 @@
+@@ -8880,7 +8931,7 @@
;;
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -934,7 +1006,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8898,7 +8902,7 @@
+@@ -8898,7 +8949,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -943,7 +1015,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8923,7 +8927,7 @@
+@@ -8923,7 +8974,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.
@@ -952,7 +1024,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8939,10 +8943,10 @@
+@@ -8939,10 +8990,10 @@
;;
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
@@ -965,7 +1037,7 @@
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8961,7 +8965,7 @@
+@@ -8961,7 +9012,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -974,7 +1046,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9018,9 +9022,9 @@
+@@ -9018,9 +9069,9 @@
CC)
# Sun C++ 4.2, 5.x and Centerline C++
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -986,7 +1058,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -9054,7 +9058,7 @@
+@@ -9054,7 +9105,7 @@
;;
gcx)
# Green Hills C++ Compiler
@@ -995,7 +1067,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 @@
+@@ -9064,9 +9115,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
@@ -1007,7 +1079,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9075,9 +9079,9 @@
+@@ -9075,9 +9126,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -1019,7 +1091,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9245,7 +9249,7 @@
+@@ -9245,7 +9296,7 @@
fi
;;
@@ -1028,7 +1100,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 @@
+@@ -9354,7 +9405,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -1037,7 +1109,7 @@
test "$enable_shared" = yes && enable_static=no
;;
esac
-@@ -9496,11 +9500,12 @@
+@@ -9496,11 +9547,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -1052,7 +1124,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 @@
+@@ -9550,7 +9602,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -1061,7 +1133,7 @@
_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 @@
+@@ -9681,7 +9733,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -1070,7 +1142,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -9712,7 +9717,7 @@
+@@ -9712,7 +9764,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -1079,7 +1151,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -9956,7 +9961,10 @@
+@@ -9956,7 +10008,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.
@@ -1091,7 +1163,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -10029,7 +10037,7 @@
+@@ -10029,7 +10084,7 @@
symcode='[[BCDEGQRST]]'
;;
solaris* | sysv5*)
@@ -1100,7 +1172,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -10047,7 +10055,7 @@
+@@ -10047,7 +10102,7 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -1109,7 +1181,7 @@
esac
# Try without a prefix undercore, then with it.
-@@ -10262,7 +10270,7 @@
+@@ -10262,7 +10317,7 @@
;;
esac
;;
@@ -1118,7 +1190,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -10313,7 +10321,7 @@
+@@ -10313,7 +10368,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'
@@ -1127,7 +1199,7 @@
cxx)
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -10338,7 +10346,7 @@
+@@ -10338,7 +10393,7 @@
;;
esac
;;
@@ -1136,7 +1208,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -10649,6 +10657,9 @@
+@@ -10649,6 +10704,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'
;;
@@ -1146,7 +1218,7 @@
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -10673,7 +10684,7 @@
+@@ -10673,7 +10731,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -1155,7 +1227,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 @@
+@@ -10747,7 +10805,7 @@
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -1164,7 +1236,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10757,13 +10768,13 @@
+@@ -10757,13 +10815,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'
@@ -1180,7 +1252,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 @@
+@@ -10772,19 +10830,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -1204,7 +1276,7 @@
fi
;;
-@@ -10802,8 +10813,8 @@
+@@ -10802,8 +10860,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -1215,7 +1287,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10816,10 +10827,36 @@
+@@ -10816,10 +10874,36 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
@@ -1254,7 +1326,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10869,9 +10906,20 @@
+@@ -10869,9 +10953,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
@@ -1277,7 +1349,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -10917,29 +10965,29 @@
+@@ -10917,29 +11012,29 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1316,7 +1388,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -10954,7 +11002,7 @@
+@@ -10954,7 +11049,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.
@@ -1325,7 +1397,7 @@
fi
fi
;;
-@@ -10977,13 +11025,13 @@
+@@ -10977,13 +11072,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -1342,7 +1414,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 @@
+@@ -10997,21 +11092,21 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -1377,7 +1449,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -11020,26 +11068,26 @@
+@@ -11020,26 +11115,26 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -1412,7 +1484,7 @@
;;
dgux*)
-@@ -11072,8 +11120,8 @@
+@@ -11072,8 +11167,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -1423,7 +1495,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 @@
+@@ -11081,7 +11176,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -1432,7 +1504,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 @@
+@@ -11099,10 +11194,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -1445,7 +1517,7 @@
;;
esac
else
-@@ -11149,7 +11197,7 @@
+@@ -11149,7 +11244,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -1454,7 +1526,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 @@
+@@ -11159,7 +11254,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -1463,7 +1535,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 @@
+@@ -11182,7 +11277,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
@@ -1472,7 +1544,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 @@
+@@ -11192,7 +11287,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
;;
*)
@@ -1481,7 +1553,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
esac
-@@ -11203,14 +11251,14 @@
+@@ -11203,14 +11298,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
@@ -1498,7 +1570,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 @@
+@@ -11222,7 +11317,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}\*'
@@ -1507,7 +1579,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 @@
+@@ -11247,9 +11342,9 @@
solaris*)
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
if test "$GCC" = yes; then
@@ -1519,7 +1591,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 @@
+@@ -11269,7 +11364,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.
@@ -1528,7 +1600,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -11329,9 +11377,9 @@
+@@ -11329,9 +11424,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
_LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -1540,7 +1612,7 @@
fi
runpath_var='LD_RUN_PATH'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11389,7 +11437,7 @@
+@@ -11389,7 +11484,7 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -1549,7 +1621,7 @@
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -11548,8 +11596,8 @@
+@@ -11548,8 +11643,8 @@
fi
done
done
@@ -1561,7 +1633,7 @@
diff -Nrua kdebase-3.4.0.orig/aclocal.m4 kdebase-3.4.0/aclocal.m4
--- kdebase-3.4.0.orig/aclocal.m4 2005-03-04 08:11:28.000000000 -0500
-+++ kdebase-3.4.0/aclocal.m4 2005-03-04 19:36:43.000000000 -0500
++++ kdebase-3.4.0/aclocal.m4 2005-03-18 14:27:19.000000000 -0500
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
@@ -2153,11 +2225,12 @@
# --------------------
diff -Nrua kdebase-3.4.0.orig/applnk/Makefile.in kdebase-3.4.0/applnk/Makefile.in
--- kdebase-3.4.0.orig/applnk/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/applnk/Makefile.in 2005-03-04 19:44:14.000000000 -0500
++++ kdebase-3.4.0/applnk/Makefile.in 2005-03-18 14:34:05.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -2254,13 +2327,23 @@
#>+ 2
docs-am:
+@@ -1021,7 +1036,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/applnk/compat/Makefile.in kdebase-3.4.0/applnk/compat/Makefile.in
--- kdebase-3.4.0.orig/applnk/compat/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/applnk/compat/Makefile.in 2005-03-04 19:44:14.000000000 -0500
++++ kdebase-3.4.0/applnk/compat/Makefile.in 2005-03-18 14:34:05.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -2300,9 +2383,31 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -773,7 +776,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdebase-3.4.0.orig/config.h.in kdebase-3.4.0/config.h.in
+--- kdebase-3.4.0.orig/config.h.in 2005-03-04 08:11:44.000000000 -0500
++++ kdebase-3.4.0/config.h.in 2005-03-18 14:27:44.000000000 -0500
+@@ -131,9 +131,6 @@
+ /* Defines if you have GL (Mesa, OpenGL, ...) */
+ #undef HAVE_GL
+
+-/* Define if you have a working getifaddrs() */
+-#undef HAVE_GOOD_GETIFADDRS
+-
+ /* Define to 1 if you have the `grantpt' function. */
+ #undef HAVE_GRANTPT
+
diff -Nrua kdebase-3.4.0.orig/configure kdebase-3.4.0/configure
--- kdebase-3.4.0.orig/configure 2005-03-04 08:15:11.000000000 -0500
-+++ kdebase-3.4.0/configure 2005-03-04 19:45:06.000000000 -0500
++++ kdebase-3.4.0/configure 2005-03-18 14:34:46.000000000 -0500
@@ -464,7 +464,7 @@
# include <unistd.h>
#endif"
@@ -7360,7 +7465,123 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32618,8 +32528,7 @@
+@@ -32534,7 +32444,114 @@
+ echo "${ECHO_T}yes" >&6
+ :
+
+- CXXFLAGS="$CXXFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
++ CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
++
++ 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
++
++
++
++ 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'
++
++
++
++ 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. */
++
++ /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */
++ template<typename CharT>
++ struct VisTest
++ {
++ inline VisTest ();
++ };
++ template<typename CharT>
++ inline VisTest<CharT>::VisTest()
++ {}
++ extern template class VisTest<char>; // It works if we drop that line
++ int some_function( int do_something ) __attribute__ ((visibility("default")));
++ int some_function( int )
++ {
++ VisTest<char> a;
++ 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
++ 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=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++
++
++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
++
++
++
+ HAVE_GCC_VISIBILITY=1
+
+ cat >>confdefs.h <<_ACEOF
+@@ -32618,8 +32635,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7370,7 +7591,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32676,8 +32585,7 @@
+@@ -32676,8 +32692,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7380,7 +7601,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32816,8 +32724,7 @@
+@@ -32816,8 +32831,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7390,7 +7611,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33057,8 +32964,7 @@
+@@ -33057,8 +33071,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7400,7 +7621,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33126,8 +33032,7 @@
+@@ -33126,8 +33139,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7410,7 +7631,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33222,8 +33127,7 @@
+@@ -33222,8 +33234,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7420,7 +7641,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33466,8 +33370,7 @@
+@@ -33466,8 +33477,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7430,7 +7651,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33539,8 +33442,7 @@
+@@ -33539,8 +33549,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7440,7 +7661,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33594,8 +33496,7 @@
+@@ -33594,8 +33603,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7450,7 +7671,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33666,8 +33567,7 @@
+@@ -33666,8 +33674,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7460,7 +7681,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33721,8 +33621,7 @@
+@@ -33721,8 +33728,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7470,7 +7691,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33789,8 +33688,7 @@
+@@ -33789,8 +33795,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7480,7 +7701,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33996,8 +33894,7 @@
+@@ -33996,8 +34001,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7490,7 +7711,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34142,8 +34039,7 @@
+@@ -34142,8 +34146,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7500,7 +7721,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34316,8 +34212,7 @@
+@@ -34316,8 +34319,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7510,7 +7731,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34376,8 +34271,7 @@
+@@ -34376,8 +34378,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7520,7 +7741,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34472,8 +34366,7 @@
+@@ -34472,8 +34473,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7530,7 +7751,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34539,8 +34432,7 @@
+@@ -34539,8 +34539,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7540,7 +7761,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34605,8 +34497,7 @@
+@@ -34605,8 +34604,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7550,7 +7771,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34669,8 +34560,7 @@
+@@ -34669,8 +34667,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7560,7 +7781,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34731,8 +34621,7 @@
+@@ -34731,8 +34728,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7570,7 +7791,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34802,8 +34691,7 @@
+@@ -34802,8 +34798,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7580,7 +7801,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34869,8 +34757,7 @@
+@@ -34869,8 +34864,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7590,7 +7811,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34936,8 +34823,7 @@
+@@ -34936,8 +34930,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7600,7 +7821,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35022,8 +34908,7 @@
+@@ -35022,8 +35015,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7610,7 +7831,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35128,8 +35013,7 @@
+@@ -35128,8 +35120,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7620,7 +7841,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35194,8 +35078,7 @@
+@@ -35194,8 +35185,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7630,7 +7851,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35270,8 +35153,7 @@
+@@ -35270,8 +35260,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7640,7 +7861,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35350,8 +35232,7 @@
+@@ -35350,8 +35339,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7650,7 +7871,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35540,8 +35421,7 @@
+@@ -35540,8 +35528,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7660,7 +7881,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35603,8 +35483,7 @@
+@@ -35603,8 +35590,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7670,7 +7891,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35644,8 +35523,7 @@
+@@ -35644,8 +35630,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7680,7 +7901,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35701,8 +35579,7 @@
+@@ -35701,8 +35686,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7690,7 +7911,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35742,8 +35619,7 @@
+@@ -35742,8 +35726,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7700,7 +7921,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35807,8 +35683,7 @@
+@@ -35807,8 +35790,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7710,7 +7931,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35839,10 +35714,8 @@
+@@ -35839,10 +35821,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -7723,7 +7944,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -35954,8 +35827,7 @@
+@@ -35954,8 +35934,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7733,7 +7954,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36017,8 +35889,7 @@
+@@ -36017,8 +35996,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7743,7 +7964,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36058,8 +35929,7 @@
+@@ -36058,8 +36036,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7753,7 +7974,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36115,8 +35985,7 @@
+@@ -36115,8 +36092,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7763,7 +7984,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36156,8 +36025,7 @@
+@@ -36156,8 +36132,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7773,7 +7994,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36221,8 +36089,7 @@
+@@ -36221,8 +36196,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7783,7 +8004,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36253,10 +36120,8 @@
+@@ -36253,10 +36227,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -7796,7 +8017,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -36368,8 +36233,7 @@
+@@ -36368,8 +36340,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7806,7 +8027,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36431,8 +36295,7 @@
+@@ -36431,8 +36402,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7816,7 +8037,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36472,8 +36335,7 @@
+@@ -36472,8 +36442,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7826,7 +8047,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36529,8 +36391,7 @@
+@@ -36529,8 +36498,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7836,7 +8057,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36570,8 +36431,7 @@
+@@ -36570,8 +36538,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7846,7 +8067,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36635,8 +36495,7 @@
+@@ -36635,8 +36602,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7856,7 +8077,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36667,10 +36526,8 @@
+@@ -36667,10 +36633,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -7869,7 +8090,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -36782,8 +36639,7 @@
+@@ -36782,8 +36746,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7879,7 +8100,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36845,8 +36701,7 @@
+@@ -36845,8 +36808,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7889,7 +8110,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36886,8 +36741,7 @@
+@@ -36886,8 +36848,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7899,7 +8120,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36943,8 +36797,7 @@
+@@ -36943,8 +36904,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7909,7 +8130,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36984,8 +36837,7 @@
+@@ -36984,8 +36944,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7919,7 +8140,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37049,8 +36901,7 @@
+@@ -37049,8 +37008,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7929,7 +8150,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37081,10 +36932,8 @@
+@@ -37081,10 +37039,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -7942,7 +8163,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -37199,8 +37048,7 @@
+@@ -37199,8 +37155,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7952,7 +8173,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37242,8 +37090,7 @@
+@@ -37242,8 +37197,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7962,7 +8183,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37300,8 +37147,7 @@
+@@ -37300,8 +37254,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7972,7 +8193,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37482,8 +37328,7 @@
+@@ -37482,8 +37435,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7982,7 +8203,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37537,9 +37382,6 @@
+@@ -37537,9 +37489,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7992,7 +8213,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37573,8 +37415,7 @@
+@@ -37573,8 +37522,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8002,7 +8223,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37678,8 +37519,7 @@
+@@ -37678,8 +37626,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8012,7 +8233,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37758,9 +37598,6 @@
+@@ -37758,9 +37705,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8022,7 +8243,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37791,8 +37628,7 @@
+@@ -37791,8 +37735,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8032,7 +8253,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37893,8 +37729,7 @@
+@@ -37893,8 +37836,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8042,7 +8263,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37973,9 +37808,6 @@
+@@ -37973,9 +37915,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8052,7 +8273,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38006,8 +37838,7 @@
+@@ -38006,8 +37945,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8062,7 +8283,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38108,8 +37939,7 @@
+@@ -38108,8 +38046,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8072,7 +8293,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38188,9 +38018,6 @@
+@@ -38188,9 +38125,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8082,7 +8303,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38226,8 +38053,7 @@
+@@ -38226,8 +38160,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8092,7 +8313,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38334,8 +38160,7 @@
+@@ -38334,8 +38267,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8102,7 +8323,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38414,9 +38239,6 @@
+@@ -38414,9 +38346,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8112,7 +8333,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38451,8 +38273,7 @@
+@@ -38451,8 +38380,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8122,7 +8343,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38557,8 +38378,7 @@
+@@ -38557,8 +38485,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8132,7 +8353,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38637,9 +38457,6 @@
+@@ -38637,9 +38564,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8142,7 +8363,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38672,8 +38489,7 @@
+@@ -38672,8 +38596,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8152,7 +8373,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38776,8 +38592,7 @@
+@@ -38776,8 +38699,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8162,7 +8383,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38856,9 +38671,6 @@
+@@ -38856,9 +38778,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8172,7 +8393,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38891,8 +38703,7 @@
+@@ -38891,8 +38810,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8182,7 +8403,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38995,8 +38806,7 @@
+@@ -38995,8 +38913,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8192,7 +8413,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39074,9 +38884,6 @@
+@@ -39074,9 +38991,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8202,7 +8423,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39109,8 +38916,7 @@
+@@ -39109,8 +39023,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8212,7 +8433,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39213,8 +39019,7 @@
+@@ -39213,8 +39126,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8222,7 +8443,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39308,8 +39113,7 @@
+@@ -39308,8 +39220,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8232,7 +8453,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39496,8 +39300,7 @@
+@@ -39496,8 +39407,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8242,7 +8463,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39567,8 +39370,7 @@
+@@ -39567,8 +39477,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8252,7 +8473,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39721,8 +39523,7 @@
+@@ -39721,8 +39630,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8262,7 +8483,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40256,8 +40057,7 @@
+@@ -40256,8 +40164,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8272,7 +8493,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40549,8 +40349,7 @@
+@@ -40549,8 +40456,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8282,7 +8503,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40695,8 +40494,7 @@
+@@ -40695,8 +40601,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8292,7 +8513,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40782,8 +40580,7 @@
+@@ -40782,8 +40687,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8302,7 +8523,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40845,8 +40642,7 @@
+@@ -40845,8 +40749,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8312,7 +8533,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40917,8 +40713,7 @@
+@@ -40917,8 +40820,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8322,7 +8543,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41008,8 +40803,7 @@
+@@ -41008,8 +40910,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8332,7 +8553,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41083,8 +40877,7 @@
+@@ -41083,8 +40984,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8342,7 +8563,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41194,8 +40987,7 @@
+@@ -41194,8 +41094,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8352,7 +8573,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41364,8 +41156,7 @@
+@@ -41364,8 +41263,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8362,16 +8583,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41427,7 +41218,7 @@
+@@ -41427,7 +41325,7 @@
do
for j in qsql.html;
do
- echo "configure: 41430: $i/$j" >&5
-+ echo "configure: 41221: $i/$j" >&5
++ echo "configure: 41328: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
QTDOCDIR=$i
-@@ -41637,8 +41428,7 @@
+@@ -41637,8 +41535,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8381,7 +8602,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41731,8 +41521,7 @@
+@@ -41731,8 +41628,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8391,16 +8612,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41904,7 +41693,7 @@
+@@ -41904,7 +41800,7 @@
do
for j in openssl/ssl.h;
do
- echo "configure: 41907: $i/$j" >&5
-+ echo "configure: 41696: $i/$j" >&5
++ echo "configure: 41803: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ssl_incdir=$i
-@@ -41959,8 +41748,7 @@
+@@ -41959,8 +41855,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8410,7 +8631,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42208,8 +41996,7 @@
+@@ -42208,8 +42103,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8420,7 +8641,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42263,8 +42050,7 @@
+@@ -42263,8 +42157,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8430,7 +8651,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42366,8 +42152,7 @@
+@@ -42366,8 +42259,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8440,7 +8661,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42432,8 +42217,7 @@
+@@ -42432,8 +42324,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8450,7 +8671,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42691,8 +42475,7 @@
+@@ -42691,8 +42582,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8460,7 +8681,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42757,8 +42540,7 @@
+@@ -42757,8 +42647,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8470,7 +8691,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42908,8 +42690,7 @@
+@@ -42908,8 +42797,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8480,7 +8701,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43062,8 +42843,7 @@
+@@ -43062,8 +42950,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8490,7 +8711,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43165,8 +42945,7 @@
+@@ -43165,8 +43052,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8500,7 +8721,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43284,8 +43063,7 @@
+@@ -43284,8 +43170,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8510,7 +8731,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43410,8 +43188,7 @@
+@@ -43410,8 +43295,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8520,7 +8741,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43798,8 +43575,7 @@
+@@ -43798,8 +43682,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8530,7 +8751,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43969,8 +43745,7 @@
+@@ -43969,8 +43852,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8540,7 +8761,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44022,13 +43797,13 @@
+@@ -44022,13 +43904,13 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -8558,7 +8779,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -44060,8 +43835,7 @@
+@@ -44060,8 +43942,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8568,7 +8789,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44073,20 +43847,20 @@
+@@ -44073,20 +43954,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -8594,7 +8815,7 @@
ac_font_enc_lib=1
else
ac_font_enc_lib=0
-@@ -44096,7 +43870,7 @@
+@@ -44096,7 +43977,7 @@
LIBS="$kde_save_LIBS"
if test "$ac_font_enc_lib" = "1"; then
@@ -8603,7 +8824,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_FONT_ENC 1
-@@ -44147,8 +43921,7 @@
+@@ -44147,8 +44028,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8613,7 +8834,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44378,8 +44151,7 @@
+@@ -44378,8 +44258,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8623,7 +8844,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44445,8 +44217,7 @@
+@@ -44445,8 +44324,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8633,7 +8854,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44492,8 +44263,7 @@
+@@ -44492,8 +44370,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8643,7 +8864,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44573,8 +44343,7 @@
+@@ -44573,8 +44450,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8653,7 +8874,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44664,8 +44433,7 @@
+@@ -44664,8 +44540,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8663,7 +8884,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44768,8 +44536,7 @@
+@@ -44768,8 +44643,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8673,7 +8894,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44966,8 +44733,7 @@
+@@ -44966,8 +44840,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8683,7 +8904,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45168,8 +44934,7 @@
+@@ -45168,8 +45041,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8693,7 +8914,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45247,8 +45012,7 @@
+@@ -45247,8 +45119,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8703,7 +8924,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45311,8 +45075,7 @@
+@@ -45311,8 +45182,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8713,7 +8934,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45396,8 +45159,7 @@
+@@ -45396,8 +45266,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8723,7 +8944,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45439,13 +45201,13 @@
+@@ -45439,13 +45308,13 @@
fi
@@ -8741,7 +8962,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -45477,8 +45239,7 @@
+@@ -45477,8 +45346,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8751,7 +8972,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45490,27 +45251,27 @@
+@@ -45490,27 +45358,27 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -8785,7 +9006,7 @@
fi
-@@ -45579,8 +45340,7 @@
+@@ -45579,8 +45447,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8795,7 +9016,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45605,13 +45365,13 @@
+@@ -45605,13 +45472,13 @@
echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86misc_h" >&6
if test $ac_cv_header_X11_extensions_xf86misc_h = yes; then
@@ -8813,7 +9034,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -45643,8 +45403,7 @@
+@@ -45643,8 +45510,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8823,7 +9044,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45656,27 +45415,27 @@
+@@ -45656,27 +45522,27 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -8857,7 +9078,7 @@
fi
-@@ -45695,13 +45454,13 @@
+@@ -45695,13 +45561,13 @@
if test -n "$LIB_XF86MISC"; then
@@ -8875,7 +9096,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -45733,8 +45492,7 @@
+@@ -45733,8 +45599,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8885,7 +9106,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45746,20 +45504,20 @@
+@@ -45746,20 +45611,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -8911,7 +9132,7 @@
cat >>confdefs.h <<\_ACEOF
-@@ -45962,8 +45720,7 @@
+@@ -45962,8 +45827,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8921,7 +9142,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46118,7 +45875,7 @@
+@@ -46118,7 +45982,7 @@
EOF
if $XMKMF >&5 2>&1 && test -f Makefile; then
@@ -8930,7 +9151,7 @@
kde_cv_defines_imake_version=$imkv
else
echo "$as_me:$LINENO: result: failed" >&5
-@@ -46234,8 +45991,7 @@
+@@ -46234,8 +46098,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8940,7 +9161,15 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46334,8 +46090,7 @@
+@@ -46269,6 +46132,7 @@
+
+ case $host_os in
+ linux*) ac_cv_func_getutxent=no;;
++ darwin*) ac_cv_func_getutxent=no;;
+ *) echo "$as_me:$LINENO: checking for getutxent" >&5
+ echo $ECHO_N "checking for getutxent... $ECHO_C" >&6
+ if test "${ac_cv_func_getutxent+set}" = set; then
+@@ -46334,8 +46198,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8950,7 +9179,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46433,8 +46188,7 @@
+@@ -46433,8 +46296,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8960,7 +9189,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46502,8 +46256,7 @@
+@@ -46502,8 +46364,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8970,7 +9199,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46547,8 +46300,7 @@
+@@ -46547,8 +46408,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8980,7 +9209,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46614,8 +46366,7 @@
+@@ -46614,8 +46474,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8990,7 +9219,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46659,8 +46410,7 @@
+@@ -46659,8 +46518,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9000,7 +9229,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46729,8 +46479,7 @@
+@@ -46729,8 +46587,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9010,7 +9239,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46777,8 +46526,7 @@
+@@ -46777,8 +46634,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9020,7 +9249,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46888,8 +46636,7 @@
+@@ -46888,8 +46744,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9030,7 +9259,17 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46995,8 +46742,7 @@
+@@ -46927,7 +46782,8 @@
+
+
+
+-for ac_func in mkstemp setproctitle sysinfo strnlen
++
++for ac_func in mkstemp setproctitle sysinfo strnlen getifaddrs
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $ac_func" >&5
+@@ -46995,8 +46851,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9040,7 +9279,97 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47181,8 +46927,7 @@
+@@ -47029,89 +46884,6 @@
+ done
+
+
+-echo "$as_me:$LINENO: checking for working getifaddrs" >&5
+-echo $ECHO_N "checking for working getifaddrs... $ECHO_C" >&6
+-if test "${ac_cv_func_getifaddrs_ok+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test "$cross_compiling" = yes; then
+- ac_cv_func_getifaddrs_ok=no
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-#include <stdio.h>
+-#include <string.h>
+-#include <sys/types.h>
+-#include <sys/socket.h>
+-#include <ifaddrs.h>
+-
+-int
+-main ()
+-{
+-
+- struct ifaddrs *ifr;
+- if (getifaddrs(&ifr) < 0) {
+- fprintf(stderr, "getifaddrs failed\n");
+- return 1;
+- }
+- for (; ifr; ifr = ifr->ifa_next)
+- if (!strcmp(ifr->ifa_name, "lo"))
+- switch (ifr->ifa_addr->sa_family) {
+- case AF_INET:
+-#ifdef AF_INET6
+- case AF_INET6:
+-#endif
+- return 0;
+- default:
+- fprintf(stderr, "getifaddrs returns nonsense\n");
+- return 1;
+- }
+- fprintf(stderr, "getifaddrs returned no loopback interface\n");
+- return 1;
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && { ac_try='./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
+- ac_cv_func_getifaddrs_ok=yes
+-else
+- echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-ac_cv_func_getifaddrs_ok=no
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_getifaddrs_ok" >&5
+-echo "${ECHO_T}$ac_cv_func_getifaddrs_ok" >&6
+-if test $ac_cv_func_getifaddrs_ok = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GOOD_GETIFADDRS 1
+-_ACEOF
+-
+-fi
+-
+
+ for ac_func in arc4random
+ do
+@@ -47181,8 +46953,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9050,7 +9379,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47293,8 +47038,7 @@
+@@ -47293,8 +47064,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9060,7 +9389,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47328,13 +47072,13 @@
+@@ -47328,13 +47098,13 @@
fi
@@ -9078,7 +9407,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -47360,8 +47104,7 @@
+@@ -47360,8 +47130,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9088,7 +9417,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47373,20 +47116,20 @@
+@@ -47373,20 +47142,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -9114,7 +9443,7 @@
:
else
-@@ -47406,13 +47149,13 @@
+@@ -47406,13 +47175,13 @@
with_xdmcp=yes
fi;
if test "x$with_xdmcp" = xyes; then
@@ -9132,7 +9461,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -47438,8 +47181,7 @@
+@@ -47438,8 +47207,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9142,7 +9471,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47451,21 +47193,21 @@
+@@ -47451,21 +47219,21 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -9170,7 +9499,7 @@
fi
if test -n "$LIBXDMCP"; then
-@@ -47495,8 +47237,7 @@
+@@ -47495,8 +47263,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9180,7 +9509,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47605,8 +47346,7 @@
+@@ -47605,8 +47372,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9190,7 +9519,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47715,8 +47455,7 @@
+@@ -47715,8 +47481,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9200,7 +9529,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47819,8 +47558,7 @@
+@@ -47819,8 +47584,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9210,7 +9539,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47888,8 +47626,7 @@
+@@ -47888,8 +47652,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9220,7 +9549,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47979,8 +47716,7 @@
+@@ -47979,8 +47742,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9230,7 +9559,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48156,8 +47892,7 @@
+@@ -48156,8 +47918,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9240,7 +9569,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48463,8 +48198,7 @@
+@@ -48463,8 +48224,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9250,16 +9579,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48555,7 +48289,7 @@
+@@ -48555,7 +48315,7 @@
do
for j in openssl/ssl.h;
do
- echo "configure: 48558: $i/$j" >&5
-+ echo "configure: 48292: $i/$j" >&5
++ echo "configure: 48318: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ssl_incdir=$i
-@@ -48610,8 +48344,7 @@
+@@ -48610,8 +48370,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9269,7 +9598,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48848,8 +48581,7 @@
+@@ -48848,8 +48607,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9279,7 +9608,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49021,8 +48753,7 @@
+@@ -49021,8 +48779,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9289,7 +9618,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49193,8 +48924,7 @@
+@@ -49193,8 +48950,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9299,7 +9628,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49286,8 +49016,7 @@
+@@ -49286,8 +49042,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9309,7 +9638,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49376,8 +49105,7 @@
+@@ -49376,8 +49131,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9319,7 +9648,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49466,8 +49194,7 @@
+@@ -49466,8 +49220,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9329,7 +9658,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49561,8 +49288,7 @@
+@@ -49561,8 +49314,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9339,7 +9668,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49667,8 +49393,7 @@
+@@ -49667,8 +49419,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9349,7 +9678,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49857,8 +49582,7 @@
+@@ -49857,8 +49608,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9359,25 +9688,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49916,7 +49640,7 @@
+@@ -49916,7 +49666,7 @@
do
for j in ldap.h;
do
- echo "configure: 49919: $i/$j" >&5
-+ echo "configure: 49643: $i/$j" >&5
++ echo "configure: 49669: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ldap_incdir=$i
-@@ -49938,7 +49662,7 @@
+@@ -49938,7 +49688,7 @@
do
for j in libldap.$ext;
do
- echo "configure: 49941: $i/$j" >&5
-+ echo "configure: 49665: $i/$j" >&5
++ echo "configure: 49691: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ldap_libdir=$i
-@@ -50035,8 +49759,7 @@
+@@ -50035,8 +49785,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9387,7 +9716,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50133,8 +49856,7 @@
+@@ -50133,8 +49882,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9397,70 +9726,70 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50292,7 +50014,7 @@
+@@ -50292,7 +50040,7 @@
do
for j in libhal.h libhal-storage.h;
do
- echo "configure: 50295: $i/$j" >&5
-+ echo "configure: 50017: $i/$j" >&5
++ echo "configure: 50043: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
hal_incdir=$i
-@@ -50314,7 +50036,7 @@
+@@ -50314,7 +50062,7 @@
do
for j in libhal.so libhal-storage.so;
do
- echo "configure: 50317: $i/$j" >&5
-+ echo "configure: 50039: $i/$j" >&5
++ echo "configure: 50065: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
hal_libdir=$i
-@@ -50359,7 +50081,7 @@
+@@ -50359,7 +50107,7 @@
do
for j in dbus/dbus.h;
do
- echo "configure: 50362: $i/$j" >&5
-+ echo "configure: 50084: $i/$j" >&5
++ echo "configure: 50110: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbus_incdir=$i
-@@ -50376,7 +50098,7 @@
+@@ -50376,7 +50124,7 @@
do
for j in dbus/dbus-arch-deps.h;
do
- echo "configure: 50379: $i/$j" >&5
-+ echo "configure: 50101: $i/$j" >&5
++ echo "configure: 50127: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbus_incdir_arch_deps=$i
-@@ -50398,7 +50120,7 @@
+@@ -50398,7 +50146,7 @@
do
for j in libdbus-1.so;
do
- echo "configure: 50401: $i/$j" >&5
-+ echo "configure: 50123: $i/$j" >&5
++ echo "configure: 50149: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbus_libdir=$i
-@@ -50441,7 +50163,7 @@
+@@ -50441,7 +50189,7 @@
do
for j in dbus/connection.h;
do
- echo "configure: 50444: $i/$j" >&5
-+ echo "configure: 50166: $i/$j" >&5
++ echo "configure: 50192: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbusqt_incdir=$i
-@@ -50468,7 +50190,7 @@
+@@ -50468,7 +50216,7 @@
do
for j in libdbus-qt-1.so;
do
- echo "configure: 50471: $i/$j" >&5
-+ echo "configure: 50193: $i/$j" >&5
++ echo "configure: 50219: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbusqt_libdir=$i
-@@ -50582,8 +50304,7 @@
+@@ -50582,8 +50330,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9470,7 +9799,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50612,8 +50333,7 @@
+@@ -50612,8 +50359,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9480,7 +9809,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50683,8 +50403,7 @@
+@@ -50683,8 +50429,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9490,7 +9819,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50736,8 +50455,7 @@
+@@ -50736,8 +50481,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9500,7 +9829,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50808,8 +50526,7 @@
+@@ -50808,8 +50552,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9510,7 +9839,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50861,8 +50578,7 @@
+@@ -50861,8 +50604,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9520,7 +9849,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50952,8 +50668,7 @@
+@@ -50952,8 +50694,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9530,7 +9859,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51122,8 +50837,7 @@
+@@ -51122,8 +50863,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9540,7 +9869,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51240,8 +50954,7 @@
+@@ -51240,8 +50980,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9550,7 +9879,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51316,8 +51029,7 @@
+@@ -51316,8 +51055,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9560,7 +9889,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51577,8 +51289,7 @@
+@@ -51577,8 +51315,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9570,7 +9899,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51700,8 +51411,7 @@
+@@ -51700,8 +51437,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9580,7 +9909,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51787,8 +51497,7 @@
+@@ -51787,8 +51523,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9590,7 +9919,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51856,8 +51565,7 @@
+@@ -51856,8 +51591,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9600,7 +9929,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51912,8 +51620,7 @@
+@@ -51912,8 +51646,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9610,7 +9939,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52537,8 +52244,7 @@
+@@ -52537,8 +52270,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9620,7 +9949,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52617,8 +52323,7 @@
+@@ -52617,8 +52349,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9630,7 +9959,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52681,8 +52386,7 @@
+@@ -52681,8 +52412,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9640,7 +9969,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52879,8 +52583,7 @@
+@@ -52879,8 +52609,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9650,7 +9979,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52982,8 +52685,7 @@
+@@ -52982,8 +52711,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9660,7 +9989,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53152,8 +52854,7 @@
+@@ -53152,8 +52880,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9670,7 +9999,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53239,8 +52940,7 @@
+@@ -53239,8 +52966,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9680,7 +10009,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53326,8 +53026,7 @@
+@@ -53326,8 +53052,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9690,7 +10019,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53425,8 +53124,7 @@
+@@ -53425,8 +53150,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9700,7 +10029,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53582,8 +53280,7 @@
+@@ -53582,8 +53306,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9710,7 +10039,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53663,8 +53360,7 @@
+@@ -53663,8 +53386,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9720,7 +10049,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -55229,6 +54925,13 @@
+@@ -55229,6 +54951,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -9734,7 +10063,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
-@@ -56806,6 +56509,9 @@
+@@ -56806,6 +56535,9 @@
s,@AMTAR@,$AMTAR,;t t
s,@am__tar@,$am__tar,;t t
s,@am__untar@,$am__untar,;t t
@@ -9744,7 +10073,7 @@
s,@KDECONFIG@,$KDECONFIG,;t t
s,@kde_libs_prefix@,$kde_libs_prefix,;t t
s,@kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -57374,11 +57080,6 @@
+@@ -57374,11 +57106,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -9756,7 +10085,7 @@
# 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. */
-@@ -57417,6 +57118,12 @@
+@@ -57417,6 +57144,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -9771,7 +10100,7 @@
sed "$ac_vpsub
diff -Nrua kdebase-3.4.0.orig/configure.in kdebase-3.4.0/configure.in
--- kdebase-3.4.0.orig/configure.in 2005-03-04 08:11:05.000000000 -0500
-+++ kdebase-3.4.0/configure.in 2005-03-04 19:36:07.000000000 -0500
++++ kdebase-3.4.0/configure.in 2005-03-18 14:26:47.000000000 -0500
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(kdebase, "3.4.0") dnl searches for some needed programs
@@ -9837,7 +10166,64 @@
kde_cv_defines_imake_version=$imkv
else
AC_MSG_RESULT([failed])
-@@ -922,7 +924,7 @@
+@@ -846,6 +848,7 @@
+ AC_CHECK_FUNCS([getttyent])
+ case $host_os in
+ linux*) ac_cv_func_getutxent=no;;
++ darwin*) ac_cv_func_getutxent=no;;
+ *) AC_CHECK_FUNC([getutxent]);;
+ esac
+ if test $ac_cv_func_getutxent = yes; then
+@@ -867,46 +870,8 @@
+ AC_CHECK_FUNCS([setlogin setusercontext getusershell login_getclass auth_timeok])
+ LIBS=$ac_save_libs
+
+-AC_CHECK_FUNCS([mkstemp setproctitle sysinfo strnlen])
+-
+-dnl is this always available without additional libs?
+-dnl my linux glibc 2.3.2 getifaddrs() returns nonsense, so ignore it
+-AC_CACHE_CHECK([for working getifaddrs], ac_cv_func_getifaddrs_ok,
+- [AC_RUN_IFELSE(
+- [AC_LANG_PROGRAM([
+-#include <stdio.h>
+-#include <string.h>
+-#include <sys/types.h>
+-#include <sys/socket.h>
+-#include <ifaddrs.h>
+- ],[[
+- struct ifaddrs *ifr;
+- if (getifaddrs(&ifr) < 0) {
+- fprintf(stderr, "getifaddrs failed\n");
+- return 1;
+- }
+- for (; ifr; ifr = ifr->ifa_next)
+- if (!strcmp(ifr->ifa_name, "lo"))
+- switch (ifr->ifa_addr->sa_family) {
+- case AF_INET:
+-#ifdef AF_INET6
+- case AF_INET6:
+-#endif
+- return 0;
+- default:
+- fprintf(stderr, "getifaddrs returns nonsense\n");
+- return 1;
+- }
+- fprintf(stderr, "getifaddrs returned no loopback interface\n");
+- return 1;
+- ]])],
+- [ac_cv_func_getifaddrs_ok=yes],
+- [ac_cv_func_getifaddrs_ok=no],
+- [ac_cv_func_getifaddrs_ok=no])
+- ])
+-if test $ac_cv_func_getifaddrs_ok = yes; then
+- AC_DEFINE(HAVE_GOOD_GETIFADDRS, 1, [Define if you have a working getifaddrs()])
+-fi
++dnl is getifaddrs always available without additional libs?
++AC_CHECK_FUNCS([mkstemp setproctitle sysinfo strnlen getifaddrs])
+
+ AC_CHECK_FUNCS([arc4random], ,
+ [
+@@ -922,7 +887,7 @@
AC_CHECK_FUNC(vsyslog, [
AC_DEFINE(USE_SYSLOG, 1, [Define if kdm should be built with syslog support])])
@@ -9846,7 +10232,7 @@
[
AC_MSG_WARN([Cannot build KDM! Make sure that libXau.a is installed!])
DO_NOT_COMPILE="$DO_NOT_COMPILE kdm"
-@@ -933,7 +935,7 @@
+@@ -933,7 +898,7 @@
AC_HELP_STRING([--without-xdmcp],[build kdm without xdmcp support [default=with xdmcp]]), ,
[with_xdmcp=yes])
if test "x$with_xdmcp" = xyes; then
@@ -9857,11 +10243,12 @@
CPPFLAGS="$CPPFLAGS $X_INCLUDES"
diff -Nrua kdebase-3.4.0.orig/doc/Makefile.in kdebase-3.4.0/doc/Makefile.in
--- kdebase-3.4.0.orig/doc/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/Makefile.in 2005-03-04 19:44:14.000000000 -0500
++++ kdebase-3.4.0/doc/Makefile.in 2005-03-18 14:34:05.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -9956,13 +10343,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -891,7 +906,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/faq/Makefile.in kdebase-3.4.0/doc/faq/Makefile.in
--- kdebase-3.4.0.orig/doc/faq/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/faq/Makefile.in 2005-03-04 19:44:14.000000000 -0500
++++ kdebase-3.4.0/doc/faq/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10035,13 +10432,23 @@
cp $(srcdir)/$$file $(distdir); \
done
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/glossary/Makefile.in kdebase-3.4.0/doc/glossary/Makefile.in
--- kdebase-3.4.0.orig/doc/glossary/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/glossary/Makefile.in 2005-03-04 19:44:14.000000000 -0500
++++ kdebase-3.4.0/doc/glossary/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10081,13 +10488,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kappfinder/Makefile.in kdebase-3.4.0/doc/kappfinder/Makefile.in
--- kdebase-3.4.0.orig/doc/kappfinder/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kappfinder/Makefile.in 2005-03-04 19:44:14.000000000 -0500
++++ kdebase-3.4.0/doc/kappfinder/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10127,13 +10544,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -763,7 +766,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kate/Makefile.in kdebase-3.4.0/doc/kate/Makefile.in
--- kdebase-3.4.0.orig/doc/kate/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kate/Makefile.in 2005-03-04 19:44:14.000000000 -0500
++++ kdebase-3.4.0/doc/kate/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10210,13 +10637,23 @@
cp $(srcdir)/$$file $(distdir); \
done
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/Makefile.in kdebase-3.4.0/doc/kcontrol/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/Makefile.in 2005-03-04 19:44:14.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10346,13 +10783,23 @@
cp $(srcdir)/$$file $(distdir); \
done
+@@ -939,7 +954,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/arts/Makefile.in kdebase-3.4.0/doc/kcontrol/arts/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/arts/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/arts/Makefile.in 2005-03-04 19:44:14.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/arts/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10425,13 +10872,23 @@
cp $(srcdir)/$$file $(distdir); \
done
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/background/Makefile.in kdebase-3.4.0/doc/kcontrol/background/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/background/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/background/Makefile.in 2005-03-04 19:44:15.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/background/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10471,13 +10928,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/bell/Makefile.in kdebase-3.4.0/doc/kcontrol/bell/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/bell/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/bell/Makefile.in 2005-03-04 19:44:15.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/bell/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10517,13 +10984,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/cache/Makefile.in kdebase-3.4.0/doc/kcontrol/cache/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/cache/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/cache/Makefile.in 2005-03-04 19:44:15.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/cache/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10563,13 +11040,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/clock/Makefile.in kdebase-3.4.0/doc/kcontrol/clock/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/clock/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/clock/Makefile.in 2005-03-04 19:44:15.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/clock/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10609,13 +11096,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/colors/Makefile.in kdebase-3.4.0/doc/kcontrol/colors/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/colors/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/colors/Makefile.in 2005-03-04 19:44:15.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/colors/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10655,13 +11152,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/cookies/Makefile.in kdebase-3.4.0/doc/kcontrol/cookies/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/cookies/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/cookies/Makefile.in 2005-03-04 19:44:15.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/cookies/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10701,13 +11208,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/crypto/Makefile.in kdebase-3.4.0/doc/kcontrol/crypto/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/crypto/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/crypto/Makefile.in 2005-03-04 19:44:15.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/crypto/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10747,13 +11264,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/desktop/Makefile.in kdebase-3.4.0/doc/kcontrol/desktop/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/desktop/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/desktop/Makefile.in 2005-03-04 19:44:15.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/desktop/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10793,13 +11320,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/desktopbehavior/Makefile.in kdebase-3.4.0/doc/kcontrol/desktopbehavior/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/desktopbehavior/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/desktopbehavior/Makefile.in 2005-03-04 19:44:15.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/desktopbehavior/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10839,13 +11376,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/ebrowsing/Makefile.in kdebase-3.4.0/doc/kcontrol/ebrowsing/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/ebrowsing/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/ebrowsing/Makefile.in 2005-03-04 19:44:15.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/ebrowsing/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10885,13 +11432,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/email/Makefile.in kdebase-3.4.0/doc/kcontrol/email/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/email/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/email/Makefile.in 2005-03-04 19:44:15.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/email/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10931,13 +11488,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/energy/Makefile.in kdebase-3.4.0/doc/kcontrol/energy/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/energy/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/energy/Makefile.in 2005-03-04 19:44:16.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/energy/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10977,13 +11544,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/filemanager/Makefile.in kdebase-3.4.0/doc/kcontrol/filemanager/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/filemanager/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/filemanager/Makefile.in 2005-03-04 19:44:16.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/filemanager/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11056,13 +11633,23 @@
cp $(srcdir)/$$file $(distdir); \
done
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/filetypes/Makefile.in kdebase-3.4.0/doc/kcontrol/filetypes/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/filetypes/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/filetypes/Makefile.in 2005-03-04 19:44:16.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/filetypes/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11102,13 +11689,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/fonts/Makefile.in kdebase-3.4.0/doc/kcontrol/fonts/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/fonts/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/fonts/Makefile.in 2005-03-04 19:44:16.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/fonts/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11148,13 +11745,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/helpindex/Makefile.in kdebase-3.4.0/doc/kcontrol/helpindex/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/helpindex/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/helpindex/Makefile.in 2005-03-04 19:44:16.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/helpindex/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11194,13 +11801,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/icons/Makefile.in kdebase-3.4.0/doc/kcontrol/icons/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/icons/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/icons/Makefile.in 2005-03-04 19:44:16.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/icons/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11240,13 +11857,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/kcmaccess/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmaccess/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/kcmaccess/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/kcmaccess/Makefile.in 2005-03-04 19:44:16.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/kcmaccess/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11286,13 +11913,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/kcmcss/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmcss/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/kcmcss/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/kcmcss/Makefile.in 2005-03-04 19:44:16.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/kcmcss/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11332,13 +11969,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/kcmfontinst/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmfontinst/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/kcmfontinst/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/kcmfontinst/Makefile.in 2005-03-04 19:44:16.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/kcmfontinst/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11378,13 +12025,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/kcmkonsole/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmkonsole/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/kcmkonsole/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/kcmkonsole/Makefile.in 2005-03-04 19:44:16.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/kcmkonsole/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11424,13 +12081,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/kcmlaunch/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmlaunch/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/kcmlaunch/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/kcmlaunch/Makefile.in 2005-03-04 19:44:16.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/kcmlaunch/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11470,13 +12137,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/kcmnotify/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmnotify/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/kcmnotify/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/kcmnotify/Makefile.in 2005-03-04 19:44:16.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/kcmnotify/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11516,13 +12193,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/kcmsmserver/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmsmserver/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/kcmsmserver/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/kcmsmserver/Makefile.in 2005-03-04 19:44:16.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/kcmsmserver/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11562,13 +12249,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/kcmstyle/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmstyle/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/kcmstyle/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/kcmstyle/Makefile.in 2005-03-04 19:44:16.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/kcmstyle/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11608,13 +12305,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/kcmtaskbar/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmtaskbar/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/kcmtaskbar/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/kcmtaskbar/Makefile.in 2005-03-04 19:44:16.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/kcmtaskbar/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11654,13 +12361,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/kdm/Makefile.in kdebase-3.4.0/doc/kcontrol/kdm/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/kdm/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/kdm/Makefile.in 2005-03-04 19:44:16.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/kdm/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11700,13 +12417,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/keyboard/Makefile.in kdebase-3.4.0/doc/kcontrol/keyboard/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/keyboard/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/keyboard/Makefile.in 2005-03-04 19:44:16.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/keyboard/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11746,13 +12473,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/keys/Makefile.in kdebase-3.4.0/doc/kcontrol/keys/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/keys/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/keys/Makefile.in 2005-03-04 19:44:16.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/keys/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11792,13 +12529,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/khtml/Makefile.in kdebase-3.4.0/doc/kcontrol/khtml/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/khtml/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/khtml/Makefile.in 2005-03-04 19:44:16.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/khtml/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11871,13 +12618,23 @@
cp $(srcdir)/$$file $(distdir); \
done
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/kwindecoration/Makefile.in kdebase-3.4.0/doc/kcontrol/kwindecoration/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/kwindecoration/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/kwindecoration/Makefile.in 2005-03-04 19:44:16.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/kwindecoration/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11917,13 +12674,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/language/Makefile.in kdebase-3.4.0/doc/kcontrol/language/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/language/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/language/Makefile.in 2005-03-04 19:44:16.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/language/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11963,13 +12730,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/mouse/Makefile.in kdebase-3.4.0/doc/kcontrol/mouse/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/mouse/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/mouse/Makefile.in 2005-03-04 19:44:16.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/mouse/Makefile.in 2005-03-18 14:34:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12009,13 +12786,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/netpref/Makefile.in kdebase-3.4.0/doc/kcontrol/netpref/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/netpref/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/netpref/Makefile.in 2005-03-04 19:44:16.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/netpref/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12055,13 +12842,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/panel/Makefile.in kdebase-3.4.0/doc/kcontrol/panel/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/panel/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/panel/Makefile.in 2005-03-04 19:44:16.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/panel/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12101,13 +12898,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/panelappearance/Makefile.in kdebase-3.4.0/doc/kcontrol/panelappearance/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/panelappearance/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/panelappearance/Makefile.in 2005-03-04 19:44:16.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/panelappearance/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12147,13 +12954,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/passwords/Makefile.in kdebase-3.4.0/doc/kcontrol/passwords/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/passwords/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/passwords/Makefile.in 2005-03-04 19:44:16.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/passwords/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12193,13 +13010,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/proxy/Makefile.in kdebase-3.4.0/doc/kcontrol/proxy/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/proxy/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/proxy/Makefile.in 2005-03-04 19:44:16.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/proxy/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12272,13 +13099,23 @@
cp $(srcdir)/$$file $(distdir); \
done
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/screensaver/Makefile.in kdebase-3.4.0/doc/kcontrol/screensaver/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/screensaver/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/screensaver/Makefile.in 2005-03-04 19:44:16.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/screensaver/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12318,13 +13155,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/smb/Makefile.in kdebase-3.4.0/doc/kcontrol/smb/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/smb/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/smb/Makefile.in 2005-03-04 19:44:17.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/smb/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12364,13 +13211,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/spellchecking/Makefile.in kdebase-3.4.0/doc/kcontrol/spellchecking/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/spellchecking/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/spellchecking/Makefile.in 2005-03-04 19:44:17.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/spellchecking/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12410,13 +13267,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/useragent/Makefile.in kdebase-3.4.0/doc/kcontrol/useragent/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/useragent/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/useragent/Makefile.in 2005-03-04 19:44:17.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/useragent/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12456,13 +13323,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/windowmanagement/Makefile.in kdebase-3.4.0/doc/kcontrol/windowmanagement/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/windowmanagement/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/windowmanagement/Makefile.in 2005-03-04 19:44:17.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/windowmanagement/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12502,13 +13379,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kdcop/Makefile.in kdebase-3.4.0/doc/kdcop/Makefile.in
--- kdebase-3.4.0.orig/doc/kdcop/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kdcop/Makefile.in 2005-03-04 19:44:17.000000000 -0500
++++ kdebase-3.4.0/doc/kdcop/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12548,13 +13435,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kdebugdialog/Makefile.in kdebase-3.4.0/doc/kdebugdialog/Makefile.in
--- kdebase-3.4.0.orig/doc/kdebugdialog/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kdebugdialog/Makefile.in 2005-03-04 19:44:17.000000000 -0500
++++ kdebase-3.4.0/doc/kdebugdialog/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12594,13 +13491,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kdeprint/Makefile.in kdebase-3.4.0/doc/kdeprint/Makefile.in
--- kdebase-3.4.0.orig/doc/kdeprint/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kdeprint/Makefile.in 2005-03-04 19:44:17.000000000 -0500
++++ kdebase-3.4.0/doc/kdeprint/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12677,13 +13584,23 @@
cp $(srcdir)/$$file $(distdir); \
done
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kdesu/Makefile.in kdebase-3.4.0/doc/kdesu/Makefile.in
--- kdebase-3.4.0.orig/doc/kdesu/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kdesu/Makefile.in 2005-03-04 19:44:17.000000000 -0500
++++ kdebase-3.4.0/doc/kdesu/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12723,13 +13640,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kdm/Makefile.in kdebase-3.4.0/doc/kdm/Makefile.in
--- kdebase-3.4.0.orig/doc/kdm/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kdm/Makefile.in 2005-03-04 19:44:17.000000000 -0500
++++ kdebase-3.4.0/doc/kdm/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12802,13 +13729,23 @@
cp $(srcdir)/$$file $(distdir); \
done
+@@ -788,7 +791,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kfind/Makefile.in kdebase-3.4.0/doc/kfind/Makefile.in
--- kdebase-3.4.0.orig/doc/kfind/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kfind/Makefile.in 2005-03-04 19:44:17.000000000 -0500
++++ kdebase-3.4.0/doc/kfind/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12848,13 +13785,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/khelpcenter/Makefile.in kdebase-3.4.0/doc/khelpcenter/Makefile.in
--- kdebase-3.4.0.orig/doc/khelpcenter/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/khelpcenter/Makefile.in 2005-03-04 19:44:17.000000000 -0500
++++ kdebase-3.4.0/doc/khelpcenter/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12975,13 +13922,23 @@
cp $(srcdir)/$$file $(distdir); \
done
+@@ -939,7 +954,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kicker/Makefile.in kdebase-3.4.0/doc/kicker/Makefile.in
--- kdebase-3.4.0.orig/doc/kicker/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kicker/Makefile.in 2005-03-04 19:44:17.000000000 -0500
++++ kdebase-3.4.0/doc/kicker/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13058,13 +14015,23 @@
cp $(srcdir)/$$file $(distdir); \
done
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/Makefile.in kdebase-3.4.0/doc/kinfocenter/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/Makefile.in 2005-03-04 19:44:17.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13161,13 +14128,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -939,7 +954,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/devices/Makefile.in kdebase-3.4.0/doc/kinfocenter/devices/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/devices/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/devices/Makefile.in 2005-03-04 19:44:17.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/devices/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13207,13 +14184,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/dma/Makefile.in kdebase-3.4.0/doc/kinfocenter/dma/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/dma/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/dma/Makefile.in 2005-03-04 19:44:17.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/dma/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13253,13 +14240,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/interrupts/Makefile.in kdebase-3.4.0/doc/kinfocenter/interrupts/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/interrupts/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/interrupts/Makefile.in 2005-03-04 19:44:17.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/interrupts/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13299,13 +14296,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/ioports/Makefile.in kdebase-3.4.0/doc/kinfocenter/ioports/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/ioports/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/ioports/Makefile.in 2005-03-04 19:44:17.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/ioports/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13345,13 +14352,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/memory/Makefile.in kdebase-3.4.0/doc/kinfocenter/memory/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/memory/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/memory/Makefile.in 2005-03-04 19:44:17.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/memory/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13391,13 +14408,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/nics/Makefile.in kdebase-3.4.0/doc/kinfocenter/nics/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/nics/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/nics/Makefile.in 2005-03-04 19:44:17.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/nics/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13437,13 +14464,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/opengl/Makefile.in kdebase-3.4.0/doc/kinfocenter/opengl/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/opengl/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/opengl/Makefile.in 2005-03-04 19:44:17.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/opengl/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13483,13 +14520,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/partitions/Makefile.in kdebase-3.4.0/doc/kinfocenter/partitions/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/partitions/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/partitions/Makefile.in 2005-03-04 19:44:17.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/partitions/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13529,13 +14576,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/pci/Makefile.in kdebase-3.4.0/doc/kinfocenter/pci/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/pci/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/pci/Makefile.in 2005-03-04 19:44:17.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/pci/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13575,13 +14632,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/pcmcia/Makefile.in kdebase-3.4.0/doc/kinfocenter/pcmcia/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/pcmcia/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/pcmcia/Makefile.in 2005-03-04 19:44:17.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/pcmcia/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13621,13 +14688,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/processor/Makefile.in kdebase-3.4.0/doc/kinfocenter/processor/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/processor/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/processor/Makefile.in 2005-03-04 19:44:17.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/processor/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13667,13 +14744,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/protocols/Makefile.in kdebase-3.4.0/doc/kinfocenter/protocols/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/protocols/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/protocols/Makefile.in 2005-03-04 19:44:17.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/protocols/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13713,13 +14800,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/samba/Makefile.in kdebase-3.4.0/doc/kinfocenter/samba/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/samba/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/samba/Makefile.in 2005-03-04 19:44:17.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/samba/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13759,13 +14856,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/scsi/Makefile.in kdebase-3.4.0/doc/kinfocenter/scsi/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/scsi/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/scsi/Makefile.in 2005-03-04 19:44:17.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/scsi/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13805,13 +14912,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/sound/Makefile.in kdebase-3.4.0/doc/kinfocenter/sound/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/sound/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/sound/Makefile.in 2005-03-04 19:44:17.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/sound/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13851,13 +14968,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/usb/Makefile.in kdebase-3.4.0/doc/kinfocenter/usb/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/usb/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/usb/Makefile.in 2005-03-04 19:44:17.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/usb/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13897,13 +15024,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/xserver/Makefile.in kdebase-3.4.0/doc/kinfocenter/xserver/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/xserver/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/xserver/Makefile.in 2005-03-04 19:44:17.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/xserver/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13943,13 +15080,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kioslave/Makefile.in kdebase-3.4.0/doc/kioslave/Makefile.in
--- kdebase-3.4.0.orig/doc/kioslave/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kioslave/Makefile.in 2005-03-04 19:44:17.000000000 -0500
++++ kdebase-3.4.0/doc/kioslave/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14026,13 +15173,23 @@
cp $(srcdir)/$$file $(distdir); \
done
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/klipper/Makefile.in kdebase-3.4.0/doc/klipper/Makefile.in
--- kdebase-3.4.0.orig/doc/klipper/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/klipper/Makefile.in 2005-03-04 19:44:17.000000000 -0500
++++ kdebase-3.4.0/doc/klipper/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14105,13 +15262,23 @@
cp $(srcdir)/$$file $(distdir); \
done
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kmenuedit/Makefile.in kdebase-3.4.0/doc/kmenuedit/Makefile.in
--- kdebase-3.4.0.orig/doc/kmenuedit/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kmenuedit/Makefile.in 2005-03-04 19:44:17.000000000 -0500
++++ kdebase-3.4.0/doc/kmenuedit/Makefile.in 2005-03-18 14:34:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14184,13 +15351,23 @@
cp $(srcdir)/$$file $(distdir); \
done
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/knetattach/Makefile.in kdebase-3.4.0/doc/knetattach/Makefile.in
--- kdebase-3.4.0.orig/doc/knetattach/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/knetattach/Makefile.in 2005-03-04 19:44:17.000000000 -0500
++++ kdebase-3.4.0/doc/knetattach/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14263,13 +15440,23 @@
cp $(srcdir)/$$file $(distdir); \
done
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/konqueror/Makefile.in kdebase-3.4.0/doc/konqueror/Makefile.in
--- kdebase-3.4.0.orig/doc/konqueror/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/konqueror/Makefile.in 2005-03-04 19:44:18.000000000 -0500
++++ kdebase-3.4.0/doc/konqueror/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14346,13 +15533,23 @@
cp $(srcdir)/$$file $(distdir); \
done
+@@ -785,7 +788,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/konsole/Makefile.in kdebase-3.4.0/doc/konsole/Makefile.in
--- kdebase-3.4.0.orig/doc/konsole/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/doc/konsole/Makefile.in 2005-03-04 19:44:18.000000000 -0500
++++ kdebase-3.4.0/doc/konsole/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14425,13 +15622,23 @@
cp $(srcdir)/$$file $(distdir); \
done
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kpager/Makefile.in kdebase-3.4.0/doc/kpager/Makefile.in
--- kdebase-3.4.0.orig/doc/kpager/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/doc/kpager/Makefile.in 2005-03-04 19:44:18.000000000 -0500
++++ kdebase-3.4.0/doc/kpager/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14504,13 +15711,23 @@
cp $(srcdir)/$$file $(distdir); \
done
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/ksplashml/Makefile.in kdebase-3.4.0/doc/ksplashml/Makefile.in
--- kdebase-3.4.0.orig/doc/ksplashml/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/doc/ksplashml/Makefile.in 2005-03-04 19:44:18.000000000 -0500
++++ kdebase-3.4.0/doc/ksplashml/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14550,13 +15767,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/ksysguard/Makefile.in kdebase-3.4.0/doc/ksysguard/Makefile.in
--- kdebase-3.4.0.orig/doc/ksysguard/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/doc/ksysguard/Makefile.in 2005-03-04 19:44:18.000000000 -0500
++++ kdebase-3.4.0/doc/ksysguard/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14596,13 +15823,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kwrite/Makefile.in kdebase-3.4.0/doc/kwrite/Makefile.in
--- kdebase-3.4.0.orig/doc/kwrite/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/doc/kwrite/Makefile.in 2005-03-04 19:44:18.000000000 -0500
++++ kdebase-3.4.0/doc/kwrite/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14642,13 +15879,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/kxkb/Makefile.in kdebase-3.4.0/doc/kxkb/Makefile.in
--- kdebase-3.4.0.orig/doc/kxkb/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/doc/kxkb/Makefile.in 2005-03-04 19:44:18.000000000 -0500
++++ kdebase-3.4.0/doc/kxkb/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14688,13 +15935,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/quickstart/Makefile.in kdebase-3.4.0/doc/quickstart/Makefile.in
--- kdebase-3.4.0.orig/doc/quickstart/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/doc/quickstart/Makefile.in 2005-03-04 19:44:18.000000000 -0500
++++ kdebase-3.4.0/doc/quickstart/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14734,13 +15991,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/userguide/Makefile.in kdebase-3.4.0/doc/userguide/Makefile.in
--- kdebase-3.4.0.orig/doc/userguide/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/doc/userguide/Makefile.in 2005-03-04 19:44:18.000000000 -0500
++++ kdebase-3.4.0/doc/userguide/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14817,13 +16084,23 @@
cp $(srcdir)/$$file $(distdir); \
done
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/doc/visualdict/Makefile.in kdebase-3.4.0/doc/visualdict/Makefile.in
--- kdebase-3.4.0.orig/doc/visualdict/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/doc/visualdict/Makefile.in 2005-03-04 19:44:18.000000000 -0500
++++ kdebase-3.4.0/doc/visualdict/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14900,13 +16177,23 @@
cp $(srcdir)/$$file $(distdir); \
done
+@@ -784,7 +787,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/drkonqi/Makefile.in kdebase-3.4.0/drkonqi/Makefile.in
--- kdebase-3.4.0.orig/drkonqi/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/drkonqi/Makefile.in 2005-03-04 19:44:18.000000000 -0500
++++ kdebase-3.4.0/drkonqi/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15065,11 +16352,12 @@
echo "#define KDE_USE_FINAL 1" >> drkonqi.all_cpp.final; \
diff -Nrua kdebase-3.4.0.orig/drkonqi/debuggers/Makefile.in kdebase-3.4.0/drkonqi/debuggers/Makefile.in
--- kdebase-3.4.0.orig/drkonqi/debuggers/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/drkonqi/debuggers/Makefile.in 2005-03-04 19:44:18.000000000 -0500
++++ kdebase-3.4.0/drkonqi/debuggers/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15109,13 +16397,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -768,7 +771,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/drkonqi/pics/Makefile.in kdebase-3.4.0/drkonqi/pics/Makefile.in
--- kdebase-3.4.0.orig/drkonqi/pics/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/drkonqi/pics/Makefile.in 2005-03-04 19:44:18.000000000 -0500
++++ kdebase-3.4.0/drkonqi/pics/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15155,13 +16453,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -767,7 +770,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/drkonqi/presets/Makefile.in kdebase-3.4.0/drkonqi/presets/Makefile.in
--- kdebase-3.4.0.orig/drkonqi/presets/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/drkonqi/presets/Makefile.in 2005-03-04 19:44:18.000000000 -0500
++++ kdebase-3.4.0/drkonqi/presets/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15201,13 +16509,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -766,7 +769,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kappfinder/Makefile.in kdebase-3.4.0/kappfinder/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/Makefile.in 2005-03-04 19:44:18.000000000 -0500
++++ kdebase-3.4.0/kappfinder/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15350,11 +16668,12 @@
force-reedit:
diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Development/Makefile.in kdebase-3.4.0/kappfinder/apps/Development/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Development/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Development/Makefile.in 2005-03-04 19:44:18.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Development/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15394,13 +16713,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -772,7 +775,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Editors/Makefile.in kdebase-3.4.0/kappfinder/apps/Editors/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Editors/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Editors/Makefile.in 2005-03-04 19:44:18.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Editors/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15449,13 +16778,23 @@
#>+ 2
docs-am:
+@@ -771,7 +774,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Games/Arcade/Makefile.in kdebase-3.4.0/kappfinder/apps/Games/Arcade/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Games/Arcade/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Games/Arcade/Makefile.in 2005-03-04 19:44:18.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Games/Arcade/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15495,13 +16834,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -774,7 +777,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Games/Board/Makefile.in kdebase-3.4.0/kappfinder/apps/Games/Board/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Games/Board/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Games/Board/Makefile.in 2005-03-04 19:44:18.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Games/Board/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15541,13 +16890,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -773,7 +776,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Games/Card/Makefile.in kdebase-3.4.0/kappfinder/apps/Games/Card/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Games/Card/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Games/Card/Makefile.in 2005-03-04 19:44:18.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Games/Card/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15587,13 +16946,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -770,7 +773,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Games/Emulators/Makefile.in kdebase-3.4.0/kappfinder/apps/Games/Emulators/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Games/Emulators/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Games/Emulators/Makefile.in 2005-03-04 19:44:18.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Games/Emulators/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15633,13 +17002,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -770,7 +773,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Games/Makefile.in kdebase-3.4.0/kappfinder/apps/Games/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Games/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Games/Makefile.in 2005-03-04 19:44:18.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Games/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15727,13 +17106,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -923,7 +938,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Games/Roguelikes/Makefile.in kdebase-3.4.0/kappfinder/apps/Games/Roguelikes/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Games/Roguelikes/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Games/Roguelikes/Makefile.in 2005-03-04 19:44:18.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Games/Roguelikes/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15773,13 +17162,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -776,7 +779,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Games/TacticStrategy/Makefile.in kdebase-3.4.0/kappfinder/apps/Games/TacticStrategy/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Games/TacticStrategy/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Games/TacticStrategy/Makefile.in 2005-03-04 19:44:18.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Games/TacticStrategy/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15819,13 +17218,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -770,7 +773,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Graphics/Makefile.in kdebase-3.4.0/kappfinder/apps/Graphics/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Graphics/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Graphics/Makefile.in 2005-03-04 19:44:18.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Graphics/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15865,13 +17274,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -774,7 +777,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Internet/Makefile.in kdebase-3.4.0/kappfinder/apps/Internet/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Internet/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Internet/Makefile.in 2005-03-04 19:44:18.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Internet/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15968,13 +17387,23 @@
#>+ 2
docs-am:
+@@ -933,7 +948,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Internet/Terminal/Makefile.in kdebase-3.4.0/kappfinder/apps/Internet/Terminal/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Internet/Terminal/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Internet/Terminal/Makefile.in 2005-03-04 19:44:18.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Internet/Terminal/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16014,13 +17443,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -773,7 +776,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Makefile.in kdebase-3.4.0/kappfinder/apps/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Makefile.in 2005-03-04 19:44:18.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16108,13 +17547,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -889,7 +904,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Multimedia/Makefile.in kdebase-3.4.0/kappfinder/apps/Multimedia/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Multimedia/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Multimedia/Makefile.in 2005-03-04 19:44:18.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Multimedia/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16163,13 +17612,23 @@
#>+ 2
docs-am:
+@@ -796,7 +799,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Office/Makefile.in kdebase-3.4.0/kappfinder/apps/Office/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Office/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Office/Makefile.in 2005-03-04 19:44:18.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Office/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16218,13 +17677,23 @@
#>+ 2
docs-am:
+@@ -775,7 +778,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/System/Makefile.in kdebase-3.4.0/kappfinder/apps/System/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/System/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/System/Makefile.in 2005-03-04 19:44:18.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/System/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16312,13 +17781,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -923,7 +938,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/System/Terminal/Makefile.in kdebase-3.4.0/kappfinder/apps/System/Terminal/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/System/Terminal/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/System/Terminal/Makefile.in 2005-03-04 19:44:18.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/System/Terminal/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16358,13 +17837,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -770,7 +773,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Toys/Makefile.in kdebase-3.4.0/kappfinder/apps/Toys/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Toys/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Toys/Makefile.in 2005-03-04 19:44:18.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Toys/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16404,13 +17893,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -768,7 +771,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Utilities/Makefile.in kdebase-3.4.0/kappfinder/apps/Utilities/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Utilities/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Utilities/Makefile.in 2005-03-04 19:44:19.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Utilities/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16498,13 +17997,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -925,7 +940,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Utilities/xutils/Makefile.in kdebase-3.4.0/kappfinder/apps/Utilities/xutils/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Utilities/xutils/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Utilities/xutils/Makefile.in 2005-03-04 19:44:19.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Utilities/xutils/Makefile.in 2005-03-18 14:34:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16544,13 +18053,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -773,7 +776,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kate/Makefile.in kdebase-3.4.0/kate/Makefile.in
--- kdebase-3.4.0.orig/kate/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kate/Makefile.in 2005-03-04 19:44:19.000000000 -0500
++++ kdebase-3.4.0/kate/Makefile.in 2005-03-18 14:34:09.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16638,13 +18157,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1074,7 +1089,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kate/app/Makefile.in kdebase-3.4.0/kate/app/Makefile.in
--- kdebase-3.4.0.orig/kate/app/Makefile.in 2005-03-04 08:14:45.000000000 -0500
-+++ kdebase-3.4.0/kate/app/Makefile.in 2005-03-04 19:44:19.000000000 -0500
++++ kdebase-3.4.0/kate/app/Makefile.in 2005-03-18 14:34:09.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16784,11 +18313,12 @@
echo "#define KDE_USE_FINAL 1" >> libkateinterfaces_la.all_cpp.final; \
diff -Nrua kdebase-3.4.0.orig/kate/data/Makefile.in kdebase-3.4.0/kate/data/Makefile.in
--- kdebase-3.4.0.orig/kate/data/Makefile.in 2005-03-04 08:14:45.000000000 -0500
-+++ kdebase-3.4.0/kate/data/Makefile.in 2005-03-04 19:44:19.000000000 -0500
++++ kdebase-3.4.0/kate/data/Makefile.in 2005-03-18 14:34:09.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16837,13 +18367,23 @@
#>+ 2
docs-am:
+@@ -969,7 +972,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kate/interfaces/Makefile.in kdebase-3.4.0/kate/interfaces/Makefile.in
--- kdebase-3.4.0.orig/kate/interfaces/Makefile.in 2005-03-04 08:14:45.000000000 -0500
-+++ kdebase-3.4.0/kate/interfaces/Makefile.in 2005-03-04 19:44:19.000000000 -0500
++++ kdebase-3.4.0/kate/interfaces/Makefile.in 2005-03-18 14:34:10.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16908,11 +18448,12 @@
clean-noinstLTLIBRARIES:
diff -Nrua kdebase-3.4.0.orig/kate/pics/Makefile.in kdebase-3.4.0/kate/pics/Makefile.in
--- kdebase-3.4.0.orig/kate/pics/Makefile.in 2005-03-04 08:14:45.000000000 -0500
-+++ kdebase-3.4.0/kate/pics/Makefile.in 2005-03-04 19:44:19.000000000 -0500
++++ kdebase-3.4.0/kate/pics/Makefile.in 2005-03-18 14:34:10.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17055,13 +18596,23 @@
#>+ 15
force-reedit:
+@@ -927,7 +942,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kate/pics/actions/Makefile.in kdebase-3.4.0/kate/pics/actions/Makefile.in
--- kdebase-3.4.0.orig/kate/pics/actions/Makefile.in 2005-03-04 08:14:45.000000000 -0500
-+++ kdebase-3.4.0/kate/pics/actions/Makefile.in 2005-03-04 19:44:19.000000000 -0500
++++ kdebase-3.4.0/kate/pics/actions/Makefile.in 2005-03-18 14:34:10.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17165,13 +18716,23 @@
-rm -f $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/unindent.png
#>+ 15
+@@ -781,7 +784,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kate/plugins/Makefile.in kdebase-3.4.0/kate/plugins/Makefile.in
--- kdebase-3.4.0.orig/kate/plugins/Makefile.in 2005-03-04 08:14:45.000000000 -0500
-+++ kdebase-3.4.0/kate/plugins/Makefile.in 2005-03-04 19:44:19.000000000 -0500
++++ kdebase-3.4.0/kate/plugins/Makefile.in 2005-03-18 14:34:10.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17259,13 +18820,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -895,7 +910,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kate/plugins/defaultproject/Makefile.in kdebase-3.4.0/kate/plugins/defaultproject/Makefile.in
--- kdebase-3.4.0.orig/kate/plugins/defaultproject/Makefile.in 2005-03-04 08:14:45.000000000 -0500
-+++ kdebase-3.4.0/kate/plugins/defaultproject/Makefile.in 2005-03-04 19:44:19.000000000 -0500
++++ kdebase-3.4.0/kate/plugins/defaultproject/Makefile.in 2005-03-18 14:34:10.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17330,11 +18901,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kate/utils/Makefile.in kdebase-3.4.0/kate/utils/Makefile.in
--- kdebase-3.4.0.orig/kate/utils/Makefile.in 2005-03-04 08:14:45.000000000 -0500
-+++ kdebase-3.4.0/kate/utils/Makefile.in 2005-03-04 19:44:19.000000000 -0500
++++ kdebase-3.4.0/kate/utils/Makefile.in 2005-03-18 14:34:10.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17399,11 +18971,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcheckpass/Makefile.in kdebase-3.4.0/kcheckpass/Makefile.in
--- kdebase-3.4.0.orig/kcheckpass/Makefile.in 2005-03-04 08:14:45.000000000 -0500
-+++ kdebase-3.4.0/kcheckpass/Makefile.in 2005-03-04 19:44:19.000000000 -0500
++++ kdebase-3.4.0/kcheckpass/Makefile.in 2005-03-18 14:34:10.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17457,13 +19030,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
+@@ -909,7 +912,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kcminit/Makefile.in kdebase-3.4.0/kcminit/Makefile.in
--- kdebase-3.4.0.orig/kcminit/Makefile.in 2005-03-04 08:14:45.000000000 -0500
-+++ kdebase-3.4.0/kcminit/Makefile.in 2005-03-04 19:44:19.000000000 -0500
++++ kdebase-3.4.0/kcminit/Makefile.in 2005-03-18 14:34:10.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17528,11 +19111,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/Makefile.in kdebase-3.4.0/kcontrol/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/Makefile.in 2005-03-04 08:14:45.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/Makefile.in 2005-03-04 19:44:19.000000000 -0500
++++ kdebase-3.4.0/kcontrol/Makefile.in 2005-03-18 14:34:11.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17620,13 +19204,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -911,7 +926,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/access/Makefile.in kdebase-3.4.0/kcontrol/access/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/access/Makefile.in 2005-03-04 08:14:46.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/access/Makefile.in 2005-03-04 19:44:19.000000000 -0500
++++ kdebase-3.4.0/kcontrol/access/Makefile.in 2005-03-18 14:34:11.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17691,11 +19285,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/accessibility/Makefile.in kdebase-3.4.0/kcontrol/accessibility/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/accessibility/Makefile.in 2005-03-04 08:14:46.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/accessibility/Makefile.in 2005-03-04 19:44:19.000000000 -0500
++++ kdebase-3.4.0/kcontrol/accessibility/Makefile.in 2005-03-18 14:34:11.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17760,11 +19355,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/arts/Makefile.in kdebase-3.4.0/kcontrol/arts/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/arts/Makefile.in 2005-03-04 08:14:46.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/arts/Makefile.in 2005-03-04 19:44:20.000000000 -0500
++++ kdebase-3.4.0/kcontrol/arts/Makefile.in 2005-03-18 14:34:11.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17829,11 +19425,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/background/Makefile.in kdebase-3.4.0/kcontrol/background/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/background/Makefile.in 2005-03-04 08:14:47.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/background/Makefile.in 2005-03-04 19:44:20.000000000 -0500
++++ kdebase-3.4.0/kcontrol/background/Makefile.in 2005-03-18 14:34:11.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17980,11 +19577,12 @@
KDE_DIST=background.desktop bgwallpaper_ui.ui bgdialog_ui.ui Makefile.in bgadvanced_ui.ui Makefile.am
diff -Nrua kdebase-3.4.0.orig/kcontrol/background/pics/Makefile.in kdebase-3.4.0/kcontrol/background/pics/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/background/pics/Makefile.in 2005-03-04 08:14:47.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/background/pics/Makefile.in 2005-03-04 19:44:20.000000000 -0500
++++ kdebase-3.4.0/kcontrol/background/pics/Makefile.in 2005-03-18 14:34:11.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18024,13 +19622,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -767,7 +770,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/bell/Makefile.in kdebase-3.4.0/kcontrol/bell/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/bell/Makefile.in 2005-03-04 08:14:47.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/bell/Makefile.in 2005-03-04 19:44:20.000000000 -0500
++++ kdebase-3.4.0/kcontrol/bell/Makefile.in 2005-03-18 14:34:11.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18095,11 +19703,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/clock/Makefile.in kdebase-3.4.0/kcontrol/clock/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/clock/Makefile.in 2005-03-04 08:14:47.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/clock/Makefile.in 2005-03-04 19:44:20.000000000 -0500
++++ kdebase-3.4.0/kcontrol/clock/Makefile.in 2005-03-18 14:34:11.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18164,11 +19773,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/colors/Makefile.in kdebase-3.4.0/kcontrol/colors/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/colors/Makefile.in 2005-03-04 08:14:47.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/colors/Makefile.in 2005-03-04 19:44:20.000000000 -0500
++++ kdebase-3.4.0/kcontrol/colors/Makefile.in 2005-03-18 14:34:11.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18233,11 +19843,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/componentchooser/Makefile.in kdebase-3.4.0/kcontrol/componentchooser/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/componentchooser/Makefile.in 2005-03-04 08:14:47.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/componentchooser/Makefile.in 2005-03-04 19:44:20.000000000 -0500
++++ kdebase-3.4.0/kcontrol/componentchooser/Makefile.in 2005-03-18 14:34:11.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18359,11 +19970,12 @@
clean-ui:
diff -Nrua kdebase-3.4.0.orig/kcontrol/componentchooser/componentservices/Makefile.in kdebase-3.4.0/kcontrol/componentchooser/componentservices/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/componentchooser/componentservices/Makefile.in 2005-03-04 08:14:47.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/componentchooser/componentservices/Makefile.in 2005-03-04 19:44:20.000000000 -0500
++++ kdebase-3.4.0/kcontrol/componentchooser/componentservices/Makefile.in 2005-03-18 14:34:11.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18403,13 +20015,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -767,7 +770,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/crypto/Makefile.in kdebase-3.4.0/kcontrol/crypto/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/crypto/Makefile.in 2005-03-04 08:14:47.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/crypto/Makefile.in 2005-03-04 19:44:21.000000000 -0500
++++ kdebase-3.4.0/kcontrol/crypto/Makefile.in 2005-03-18 14:34:11.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18474,11 +20096,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/css/Makefile.in kdebase-3.4.0/kcontrol/css/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/css/Makefile.in 2005-03-04 08:14:48.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/css/Makefile.in 2005-03-04 19:44:21.000000000 -0500
++++ kdebase-3.4.0/kcontrol/css/Makefile.in 2005-03-18 14:34:11.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18543,11 +20166,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/display/Makefile.in kdebase-3.4.0/kcontrol/display/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/display/Makefile.in 2005-03-04 08:14:48.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/display/Makefile.in 2005-03-04 19:44:21.000000000 -0500
++++ kdebase-3.4.0/kcontrol/display/Makefile.in 2005-03-18 14:34:11.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18612,11 +20236,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/dnssd/Makefile.in kdebase-3.4.0/kcontrol/dnssd/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/dnssd/Makefile.in 2005-03-04 08:14:48.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/dnssd/Makefile.in 2005-03-04 19:44:21.000000000 -0500
++++ kdebase-3.4.0/kcontrol/dnssd/Makefile.in 2005-03-18 14:34:11.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18691,11 +20316,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/ebrowsing/Makefile.in kdebase-3.4.0/kcontrol/ebrowsing/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/ebrowsing/Makefile.in 2005-03-04 08:14:48.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/ebrowsing/Makefile.in 2005-03-04 19:44:21.000000000 -0500
++++ kdebase-3.4.0/kcontrol/ebrowsing/Makefile.in 2005-03-18 14:34:12.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18808,11 +20434,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/Makefile.in kdebase-3.4.0/kcontrol/ebrowsing/plugins/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/Makefile.in 2005-03-04 08:14:48.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/ebrowsing/plugins/Makefile.in 2005-03-04 19:44:21.000000000 -0500
++++ kdebase-3.4.0/kcontrol/ebrowsing/plugins/Makefile.in 2005-03-18 14:34:12.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18900,13 +20527,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -887,7 +902,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/ikws/Makefile.in kdebase-3.4.0/kcontrol/ebrowsing/plugins/ikws/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/ikws/Makefile.in 2005-03-04 08:14:49.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/ebrowsing/plugins/ikws/Makefile.in 2005-03-04 19:44:21.000000000 -0500
++++ kdebase-3.4.0/kcontrol/ebrowsing/plugins/ikws/Makefile.in 2005-03-18 14:34:12.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19019,11 +20656,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in kdebase-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in 2005-03-04 08:14:49.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in 2005-03-04 19:44:21.000000000 -0500
++++ kdebase-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in 2005-03-18 14:34:12.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19072,13 +20710,23 @@
#>+ 2
docs-am:
+@@ -852,7 +855,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/localdomain/Makefile.in kdebase-3.4.0/kcontrol/ebrowsing/plugins/localdomain/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/localdomain/Makefile.in 2005-03-04 08:14:49.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/ebrowsing/plugins/localdomain/Makefile.in 2005-03-04 19:44:21.000000000 -0500
++++ kdebase-3.4.0/kcontrol/ebrowsing/plugins/localdomain/Makefile.in 2005-03-18 14:34:12.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19156,11 +20804,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/shorturi/Makefile.in kdebase-3.4.0/kcontrol/ebrowsing/plugins/shorturi/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/shorturi/Makefile.in 2005-03-04 08:14:49.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/ebrowsing/plugins/shorturi/Makefile.in 2005-03-04 19:44:21.000000000 -0500
++++ kdebase-3.4.0/kcontrol/ebrowsing/plugins/shorturi/Makefile.in 2005-03-18 14:34:12.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19225,11 +20874,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/energy/Makefile.in kdebase-3.4.0/kcontrol/energy/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/energy/Makefile.in 2005-03-04 08:14:49.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/energy/Makefile.in 2005-03-04 19:44:21.000000000 -0500
++++ kdebase-3.4.0/kcontrol/energy/Makefile.in 2005-03-18 14:34:12.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19342,11 +20992,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/kcontrol/energy/pics/Makefile.in kdebase-3.4.0/kcontrol/energy/pics/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/energy/pics/Makefile.in 2005-03-04 08:14:49.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/energy/pics/Makefile.in 2005-03-04 19:44:21.000000000 -0500
++++ kdebase-3.4.0/kcontrol/energy/pics/Makefile.in 2005-03-18 14:34:12.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19386,13 +21037,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -767,7 +770,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/filetypes/Makefile.in kdebase-3.4.0/kcontrol/filetypes/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/filetypes/Makefile.in 2005-03-04 08:14:49.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/filetypes/Makefile.in 2005-03-04 19:44:22.000000000 -0500
++++ kdebase-3.4.0/kcontrol/filetypes/Makefile.in 2005-03-18 14:34:12.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19491,11 +21152,12 @@
KDE_DIST=filetypes.desktop keditfiletype.h Makefile.in Makefile.am
diff -Nrua kdebase-3.4.0.orig/kcontrol/fonts/Makefile.in kdebase-3.4.0/kcontrol/fonts/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/fonts/Makefile.in 2005-03-04 08:14:49.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/fonts/Makefile.in 2005-03-04 19:44:22.000000000 -0500
++++ kdebase-3.4.0/kcontrol/fonts/Makefile.in 2005-03-18 14:34:12.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19560,11 +21222,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/icons/Makefile.in kdebase-3.4.0/kcontrol/icons/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/icons/Makefile.in 2005-03-04 08:14:50.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/icons/Makefile.in 2005-03-04 19:44:22.000000000 -0500
++++ kdebase-3.4.0/kcontrol/icons/Makefile.in 2005-03-18 14:34:12.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19672,11 +21335,12 @@
echo "#define KDE_USE_FINAL 1" >> kcm_icons_la.all_cpp.final; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/info/Makefile.in kdebase-3.4.0/kcontrol/info/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/info/Makefile.in 2005-03-04 08:14:50.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/info/Makefile.in 2005-03-04 19:44:23.000000000 -0500
++++ kdebase-3.4.0/kcontrol/info/Makefile.in 2005-03-18 14:34:12.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19750,11 +21414,12 @@
clean-closures:
diff -Nrua kdebase-3.4.0.orig/kcontrol/input/Makefile.in kdebase-3.4.0/kcontrol/input/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/input/Makefile.in 2005-03-04 08:14:50.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/input/Makefile.in 2005-03-04 19:44:23.000000000 -0500
++++ kdebase-3.4.0/kcontrol/input/Makefile.in 2005-03-18 14:34:12.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19867,11 +21532,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/kcontrol/input/core/Makefile.in kdebase-3.4.0/kcontrol/input/core/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/input/core/Makefile.in 2005-03-04 08:14:51.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/input/core/Makefile.in 2005-03-04 19:44:23.000000000 -0500
++++ kdebase-3.4.0/kcontrol/input/core/Makefile.in 2005-03-18 14:34:12.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19936,11 +21602,12 @@
clean-noinstLTLIBRARIES:
diff -Nrua kdebase-3.4.0.orig/kcontrol/input/pics/Makefile.in kdebase-3.4.0/kcontrol/input/pics/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/input/pics/Makefile.in 2005-03-04 08:14:51.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/input/pics/Makefile.in 2005-03-04 19:44:24.000000000 -0500
++++ kdebase-3.4.0/kcontrol/input/pics/Makefile.in 2005-03-18 14:34:12.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19980,13 +21647,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -767,7 +770,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/input/xcursor/Makefile.in kdebase-3.4.0/kcontrol/input/xcursor/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/input/xcursor/Makefile.in 2005-03-04 08:14:51.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/input/xcursor/Makefile.in 2005-03-04 19:44:24.000000000 -0500
++++ kdebase-3.4.0/kcontrol/input/xcursor/Makefile.in 2005-03-18 14:34:12.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20051,11 +21728,12 @@
clean-noinstLTLIBRARIES:
diff -Nrua kdebase-3.4.0.orig/kcontrol/ioslaveinfo/Makefile.in kdebase-3.4.0/kcontrol/ioslaveinfo/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/ioslaveinfo/Makefile.in 2005-03-04 08:14:51.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/ioslaveinfo/Makefile.in 2005-03-04 19:44:24.000000000 -0500
++++ kdebase-3.4.0/kcontrol/ioslaveinfo/Makefile.in 2005-03-18 14:34:12.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20120,11 +21798,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/joystick/Makefile.in kdebase-3.4.0/kcontrol/joystick/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/joystick/Makefile.in 2005-03-04 08:14:52.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/joystick/Makefile.in 2005-03-04 19:44:24.000000000 -0500
++++ kdebase-3.4.0/kcontrol/joystick/Makefile.in 2005-03-18 14:34:13.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20189,11 +21868,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/kcontrol/Makefile.in kdebase-3.4.0/kcontrol/kcontrol/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/kcontrol/Makefile.in 2005-03-04 08:14:52.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kcontrol/Makefile.in 2005-03-04 19:44:24.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kcontrol/Makefile.in 2005-03-18 14:34:13.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20382,11 +22062,12 @@
echo "#define KDE_USE_FINAL 1" >> libkdeinit_kcontrol_la.all_cpp.final; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/kcontrol/about/Makefile.in kdebase-3.4.0/kcontrol/kcontrol/about/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/kcontrol/about/Makefile.in 2005-03-04 08:14:52.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kcontrol/about/Makefile.in 2005-03-04 19:44:24.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kcontrol/about/Makefile.in 2005-03-18 14:34:13.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20426,13 +22107,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -770,7 +773,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/kded/Makefile.in kdebase-3.4.0/kcontrol/kded/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/kded/Makefile.in 2005-03-04 08:14:52.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kded/Makefile.in 2005-03-04 19:44:24.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kded/Makefile.in 2005-03-18 14:34:13.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20506,11 +22197,12 @@
clean-closures:
diff -Nrua kdebase-3.4.0.orig/kcontrol/kdm/Makefile.in kdebase-3.4.0/kcontrol/kdm/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/kdm/Makefile.in 2005-03-04 08:14:52.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kdm/Makefile.in 2005-03-04 19:44:24.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kdm/Makefile.in 2005-03-18 14:34:13.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20628,11 +22320,12 @@
kdm-sess.lo: kdm-sess.moc
diff -Nrua kdebase-3.4.0.orig/kcontrol/keys/Makefile.in kdebase-3.4.0/kcontrol/keys/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/keys/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/keys/Makefile.in 2005-03-04 19:44:25.000000000 -0500
++++ kdebase-3.4.0/kcontrol/keys/Makefile.in 2005-03-18 14:34:13.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20697,11 +22390,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/kfontinst/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/kfontinst/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kfontinst/Makefile.in 2005-03-04 19:44:25.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kfontinst/Makefile.in 2005-03-18 14:34:13.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20789,13 +22483,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -928,7 +943,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/kfontinst/kcmfontinst/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/kcmfontinst/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/kfontinst/kcmfontinst/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kfontinst/kcmfontinst/Makefile.in 2005-03-04 19:44:25.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kfontinst/kcmfontinst/Makefile.in 2005-03-18 14:34:13.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20884,11 +22588,12 @@
force-reedit:
diff -Nrua kdebase-3.4.0.orig/kcontrol/kfontinst/kfile-plugin/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/kfile-plugin/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/kfontinst/kfile-plugin/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kfontinst/kfile-plugin/Makefile.in 2005-03-04 19:44:25.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kfontinst/kfile-plugin/Makefile.in 2005-03-18 14:34:13.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20953,11 +22658,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/kfontinst/kfontinst/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/kfontinst/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/kfontinst/kfontinst/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kfontinst/kfontinst/Makefile.in 2005-03-04 19:44:25.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kfontinst/kfontinst/Makefile.in 2005-03-18 14:34:13.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21035,11 +22741,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/kfontinst/kio/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/kio/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/kfontinst/kio/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kfontinst/kio/Makefile.in 2005-03-04 19:44:25.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kfontinst/kio/Makefile.in 2005-03-18 14:34:13.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21104,11 +22811,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/kfontinst/lib/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/lib/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/kfontinst/lib/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kfontinst/lib/Makefile.in 2005-03-04 19:44:25.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kfontinst/lib/Makefile.in 2005-03-18 14:34:13.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21173,11 +22881,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/kfontinst/thumbnail/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/thumbnail/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/kfontinst/thumbnail/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kfontinst/thumbnail/Makefile.in 2005-03-04 19:44:25.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kfontinst/thumbnail/Makefile.in 2005-03-18 14:34:13.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21242,11 +22951,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/kfontinst/viewpart/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/viewpart/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/kfontinst/viewpart/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kfontinst/viewpart/Makefile.in 2005-03-04 19:44:25.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kfontinst/viewpart/Makefile.in 2005-03-18 14:34:14.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21311,11 +23021,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/kicker/Makefile.in kdebase-3.4.0/kcontrol/kicker/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/kicker/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kicker/Makefile.in 2005-03-04 19:44:25.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kicker/Makefile.in 2005-03-18 14:34:14.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21414,11 +23125,12 @@
KDE_DIST=applettab_impl.h lookandfeeltab.ui lookandfeeltab_kcm.h advancedOptions.ui panel.desktop positiontab.ui kicker_config_appearance.desktop applettab_impl.cpp kicker_config.desktop menutab.ui applettab.ui Makefile.in hidingtab.ui uninstall.desktop lookandfeeltab_kcm.cpp Makefile.am
diff -Nrua kdebase-3.4.0.orig/kcontrol/kio/Makefile.in kdebase-3.4.0/kcontrol/kio/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/kio/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kio/Makefile.in 2005-03-04 19:44:25.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kio/Makefile.in 2005-03-18 14:34:14.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21603,11 +23315,12 @@
echo "#define KDE_USE_FINAL 1" >> kcm_kio_la.all_cpp.final; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/kio/uasproviders/Makefile.in kdebase-3.4.0/kcontrol/kio/uasproviders/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/kio/uasproviders/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kio/uasproviders/Makefile.in 2005-03-04 19:44:25.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kio/uasproviders/Makefile.in 2005-03-18 14:34:14.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21656,13 +23369,23 @@
#>+ 2
docs-am:
+@@ -776,7 +779,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/knotify/Makefile.in kdebase-3.4.0/kcontrol/knotify/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/knotify/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/knotify/Makefile.in 2005-03-04 19:44:25.000000000 -0500
++++ kdebase-3.4.0/kcontrol/knotify/Makefile.in 2005-03-18 14:34:14.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21775,11 +23498,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/kcontrol/knotify/sounds/Makefile.in kdebase-3.4.0/kcontrol/knotify/sounds/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/knotify/sounds/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/knotify/sounds/Makefile.in 2005-03-04 19:44:25.000000000 -0500
++++ kdebase-3.4.0/kcontrol/knotify/sounds/Makefile.in 2005-03-18 14:34:14.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21828,13 +23552,23 @@
#>+ 2
docs-am:
+@@ -877,7 +880,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/konq/Makefile.in kdebase-3.4.0/kcontrol/konq/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/konq/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/konq/Makefile.in 2005-03-04 19:44:25.000000000 -0500
++++ kdebase-3.4.0/kcontrol/konq/Makefile.in 2005-03-18 14:34:14.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21946,11 +23680,12 @@
echo "#define KDE_USE_FINAL 1" >> kcm_konq_la.all_cpp.final; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/konqhtml/Makefile.in kdebase-3.4.0/kcontrol/konqhtml/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/konqhtml/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/konqhtml/Makefile.in 2005-03-04 19:44:26.000000000 -0500
++++ kdebase-3.4.0/kcontrol/konqhtml/Makefile.in 2005-03-18 14:34:14.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22054,11 +23789,12 @@
echo "#define KDE_USE_FINAL 1" >> kcm_konqhtml_la.all_cpp.final; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/konsole/Makefile.in kdebase-3.4.0/kcontrol/konsole/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/konsole/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/konsole/Makefile.in 2005-03-04 19:44:26.000000000 -0500
++++ kdebase-3.4.0/kcontrol/konsole/Makefile.in 2005-03-18 14:34:14.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22123,11 +23859,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/Makefile.in kdebase-3.4.0/kcontrol/krdb/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/krdb/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/Makefile.in 2005-03-04 19:44:26.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/Makefile.in 2005-03-18 14:34:14.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22240,11 +23977,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/ad/Makefile.in kdebase-3.4.0/kcontrol/krdb/ad/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/krdb/ad/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/ad/Makefile.in 2005-03-04 19:44:26.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/ad/Makefile.in 2005-03-18 14:34:14.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22293,13 +24031,23 @@
#>+ 2
docs-am:
+@@ -798,7 +801,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/kcs/Makefile.in kdebase-3.4.0/kcontrol/krdb/kcs/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/krdb/kcs/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/kcs/Makefile.in 2005-03-04 19:44:26.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/kcs/Makefile.in 2005-03-18 14:34:15.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22348,13 +24096,23 @@
#>+ 2
docs-am:
+@@ -777,7 +780,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/pics/Makefile.in kdebase-3.4.0/kcontrol/krdb/pics/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/krdb/pics/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/pics/Makefile.in 2005-03-04 19:44:26.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/pics/Makefile.in 2005-03-18 14:34:15.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22394,13 +24152,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -767,7 +770,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastDark/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/HighContrastDark/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastDark/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/HighContrastDark/Makefile.in 2005-03-04 19:44:26.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/HighContrastDark/Makefile.in 2005-03-18 14:34:15.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22440,13 +24208,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -768,7 +771,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastDark-big/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/HighContrastDark-big/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastDark-big/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/HighContrastDark-big/Makefile.in 2005-03-04 19:44:26.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/HighContrastDark-big/Makefile.in 2005-03-18 14:34:15.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22486,13 +24264,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -768,7 +771,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastLight/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/HighContrastLight/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastLight/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/HighContrastLight/Makefile.in 2005-03-04 19:44:26.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/HighContrastLight/Makefile.in 2005-03-18 14:34:15.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22532,13 +24320,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -768,7 +771,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastLight-big/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/HighContrastLight-big/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastLight-big/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/HighContrastLight-big/Makefile.in 2005-03-04 19:44:26.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/HighContrastLight-big/Makefile.in 2005-03-18 14:34:15.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22578,13 +24376,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -768,7 +771,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/KDE_Classic/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/KDE_Classic/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/krdb/themes/KDE_Classic/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/KDE_Classic/Makefile.in 2005-03-04 19:44:26.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/KDE_Classic/Makefile.in 2005-03-18 14:34:15.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22624,13 +24432,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -768,7 +771,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/Keramik/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/Keramik/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/krdb/themes/Keramik/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/Keramik/Makefile.in 2005-03-04 19:44:26.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/Keramik/Makefile.in 2005-03-18 14:34:15.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22670,13 +24488,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -768,7 +771,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/krdb/themes/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/Makefile.in 2005-03-04 19:44:26.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/Makefile.in 2005-03-18 14:34:15.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22764,13 +24592,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -891,7 +906,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/Plastik/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/Plastik/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/krdb/themes/Plastik/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/Plastik/Makefile.in 2005-03-04 19:44:26.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/Plastik/Makefile.in 2005-03-18 14:34:15.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22810,13 +24648,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -768,7 +771,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/Platinum/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/Platinum/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/krdb/themes/Platinum/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/Platinum/Makefile.in 2005-03-04 19:44:26.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/Platinum/Makefile.in 2005-03-18 14:34:15.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22856,13 +24704,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -768,7 +771,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/Redmond/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/Redmond/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/krdb/themes/Redmond/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/Redmond/Makefile.in 2005-03-04 19:44:26.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/Redmond/Makefile.in 2005-03-18 14:34:15.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22902,13 +24760,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -768,7 +771,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/Sunshine/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/Sunshine/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/krdb/themes/Sunshine/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/Sunshine/Makefile.in 2005-03-04 19:44:26.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/Sunshine/Makefile.in 2005-03-18 14:34:15.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22948,13 +24816,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -768,7 +771,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/YellowOnBlue/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/YellowOnBlue/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/krdb/themes/YellowOnBlue/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/YellowOnBlue/Makefile.in 2005-03-04 19:44:26.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/YellowOnBlue/Makefile.in 2005-03-18 14:34:15.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22994,13 +24872,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -768,7 +771,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in 2005-03-04 19:44:26.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in 2005-03-18 14:34:15.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23040,13 +24928,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -768,7 +771,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/kthememanager/Makefile.in kdebase-3.4.0/kcontrol/kthememanager/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/kthememanager/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kthememanager/Makefile.in 2005-03-04 19:44:27.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kthememanager/Makefile.in 2005-03-18 14:34:15.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23111,11 +25009,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/launch/Makefile.in kdebase-3.4.0/kcontrol/launch/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/launch/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/launch/Makefile.in 2005-03-04 19:44:27.000000000 -0500
++++ kdebase-3.4.0/kcontrol/launch/Makefile.in 2005-03-18 14:34:15.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23180,11 +25079,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/locale/Makefile.in kdebase-3.4.0/kcontrol/locale/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/locale/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/locale/Makefile.in 2005-03-04 19:44:27.000000000 -0500
++++ kdebase-3.4.0/kcontrol/locale/Makefile.in 2005-03-18 14:34:16.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23340,11 +25240,12 @@
echo "#define KDE_USE_FINAL 1" >> kcm_locale_la.all_cpp.final; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/locale/default/Makefile.in kdebase-3.4.0/kcontrol/locale/default/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/locale/default/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/locale/default/Makefile.in 2005-03-04 19:44:27.000000000 -0500
++++ kdebase-3.4.0/kcontrol/locale/default/Makefile.in 2005-03-18 14:34:16.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23384,13 +25285,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -767,7 +770,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/locale/pics/Makefile.in kdebase-3.4.0/kcontrol/locale/pics/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/locale/pics/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/locale/pics/Makefile.in 2005-03-04 19:44:27.000000000 -0500
++++ kdebase-3.4.0/kcontrol/locale/pics/Makefile.in 2005-03-18 14:34:16.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23430,13 +25341,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -766,7 +769,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/nics/Makefile.in kdebase-3.4.0/kcontrol/nics/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/nics/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/nics/Makefile.in 2005-03-04 19:44:27.000000000 -0500
++++ kdebase-3.4.0/kcontrol/nics/Makefile.in 2005-03-18 14:34:16.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23501,11 +25422,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/performance/Makefile.in kdebase-3.4.0/kcontrol/performance/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/performance/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/performance/Makefile.in 2005-03-04 19:44:27.000000000 -0500
++++ kdebase-3.4.0/kcontrol/performance/Makefile.in 2005-03-18 14:34:16.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23613,11 +25535,12 @@
echo "#define KDE_USE_FINAL 1" >> kcm_performance_la.all_cpp.final; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/pics/Makefile.in kdebase-3.4.0/kcontrol/pics/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/pics/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/pics/Makefile.in 2005-03-04 19:44:27.000000000 -0500
++++ kdebase-3.4.0/kcontrol/pics/Makefile.in 2005-03-18 14:34:16.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24684,13 +26607,23 @@
#>+ 15
force-reedit:
+@@ -1277,7 +1280,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kcontrol/privacy/Makefile.in kdebase-3.4.0/kcontrol/privacy/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/privacy/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/privacy/Makefile.in 2005-03-04 19:44:27.000000000 -0500
++++ kdebase-3.4.0/kcontrol/privacy/Makefile.in 2005-03-18 14:34:17.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24755,11 +26688,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/randr/Makefile.in kdebase-3.4.0/kcontrol/randr/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/randr/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/randr/Makefile.in 2005-03-04 19:44:27.000000000 -0500
++++ kdebase-3.4.0/kcontrol/randr/Makefile.in 2005-03-18 14:34:17.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24824,11 +26758,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/samba/Makefile.in kdebase-3.4.0/kcontrol/samba/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/samba/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/samba/Makefile.in 2005-03-04 19:44:27.000000000 -0500
++++ kdebase-3.4.0/kcontrol/samba/Makefile.in 2005-03-18 14:34:17.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24893,11 +26828,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/screensaver/Makefile.in kdebase-3.4.0/kcontrol/screensaver/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/screensaver/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/screensaver/Makefile.in 2005-03-04 19:44:27.000000000 -0500
++++ kdebase-3.4.0/kcontrol/screensaver/Makefile.in 2005-03-18 14:34:17.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24962,11 +26898,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/smartcard/Makefile.in kdebase-3.4.0/kcontrol/smartcard/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/smartcard/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/smartcard/Makefile.in 2005-03-04 19:44:27.000000000 -0500
++++ kdebase-3.4.0/kcontrol/smartcard/Makefile.in 2005-03-18 14:34:17.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25031,11 +26968,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/smserver/Makefile.in kdebase-3.4.0/kcontrol/smserver/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/smserver/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/smserver/Makefile.in 2005-03-04 19:44:27.000000000 -0500
++++ kdebase-3.4.0/kcontrol/smserver/Makefile.in 2005-03-18 14:34:17.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25100,11 +27038,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/spellchecking/Makefile.in kdebase-3.4.0/kcontrol/spellchecking/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/spellchecking/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/spellchecking/Makefile.in 2005-03-04 19:44:27.000000000 -0500
++++ kdebase-3.4.0/kcontrol/spellchecking/Makefile.in 2005-03-18 14:34:17.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25169,11 +27108,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/style/Makefile.in kdebase-3.4.0/kcontrol/style/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/style/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/style/Makefile.in 2005-03-04 19:44:28.000000000 -0500
++++ kdebase-3.4.0/kcontrol/style/Makefile.in 2005-03-18 14:34:17.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25286,11 +27226,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/kcontrol/style/keramik/Makefile.in kdebase-3.4.0/kcontrol/style/keramik/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/style/keramik/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/style/keramik/Makefile.in 2005-03-04 19:44:28.000000000 -0500
++++ kdebase-3.4.0/kcontrol/style/keramik/Makefile.in 2005-03-18 14:34:17.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25355,11 +27296,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/taskbar/Makefile.in kdebase-3.4.0/kcontrol/taskbar/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/taskbar/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/taskbar/Makefile.in 2005-03-04 19:44:28.000000000 -0500
++++ kdebase-3.4.0/kcontrol/taskbar/Makefile.in 2005-03-18 14:34:17.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25424,11 +27366,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/usbview/Makefile.in kdebase-3.4.0/kcontrol/usbview/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/usbview/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/usbview/Makefile.in 2005-03-04 19:44:28.000000000 -0500
++++ kdebase-3.4.0/kcontrol/usbview/Makefile.in 2005-03-18 14:34:17.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25493,11 +27436,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/view1394/Makefile.in kdebase-3.4.0/kcontrol/view1394/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/view1394/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/view1394/Makefile.in 2005-03-04 19:44:28.000000000 -0500
++++ kdebase-3.4.0/kcontrol/view1394/Makefile.in 2005-03-18 14:34:17.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25562,11 +27506,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kcontrol/xinerama/Makefile.in kdebase-3.4.0/kcontrol/xinerama/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/xinerama/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/xinerama/Makefile.in 2005-03-04 19:44:28.000000000 -0500
++++ kdebase-3.4.0/kcontrol/xinerama/Makefile.in 2005-03-18 14:34:17.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25631,11 +27576,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kdcop/Makefile.in kdebase-3.4.0/kdcop/Makefile.in
--- kdebase-3.4.0.orig/kdcop/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdcop/Makefile.in 2005-03-04 19:44:28.000000000 -0500
++++ kdebase-3.4.0/kdcop/Makefile.in 2005-03-18 14:34:17.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25700,11 +27646,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kdebugdialog/Makefile.in kdebase-3.4.0/kdebugdialog/Makefile.in
--- kdebase-3.4.0.orig/kdebugdialog/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdebugdialog/Makefile.in 2005-03-04 19:44:28.000000000 -0500
++++ kdebase-3.4.0/kdebugdialog/Makefile.in 2005-03-18 14:34:17.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25769,11 +27716,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kdepasswd/Makefile.in kdebase-3.4.0/kdepasswd/Makefile.in
--- kdebase-3.4.0.orig/kdepasswd/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdepasswd/Makefile.in 2005-03-04 19:44:28.000000000 -0500
++++ kdebase-3.4.0/kdepasswd/Makefile.in 2005-03-18 14:34:17.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25886,11 +27834,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/kdepasswd/kcm/Makefile.in kdebase-3.4.0/kdepasswd/kcm/Makefile.in
--- kdebase-3.4.0.orig/kdepasswd/kcm/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdepasswd/kcm/Makefile.in 2005-03-04 19:44:28.000000000 -0500
++++ kdebase-3.4.0/kdepasswd/kcm/Makefile.in 2005-03-18 14:34:18.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26003,11 +27952,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/kdepasswd/kcm/pics/Makefile.in kdebase-3.4.0/kdepasswd/kcm/pics/Makefile.in
--- kdebase-3.4.0.orig/kdepasswd/kcm/pics/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdepasswd/kcm/pics/Makefile.in 2005-03-04 19:44:28.000000000 -0500
++++ kdebase-3.4.0/kdepasswd/kcm/pics/Makefile.in 2005-03-18 14:34:18.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26047,13 +27997,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -773,7 +776,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kdeprint/Makefile.in kdebase-3.4.0/kdeprint/Makefile.in
--- kdebase-3.4.0.orig/kdeprint/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdeprint/Makefile.in 2005-03-04 19:44:28.000000000 -0500
++++ kdebase-3.4.0/kdeprint/Makefile.in 2005-03-18 14:34:18.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26141,13 +28101,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -887,7 +902,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kdeprint/descriptions/Makefile.in kdebase-3.4.0/kdeprint/descriptions/Makefile.in
--- kdebase-3.4.0.orig/kdeprint/descriptions/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdeprint/descriptions/Makefile.in 2005-03-04 19:44:28.000000000 -0500
++++ kdebase-3.4.0/kdeprint/descriptions/Makefile.in 2005-03-18 14:34:18.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26212,11 +28182,12 @@
@rm -f sortthem$(EXEEXT)
diff -Nrua kdebase-3.4.0.orig/kdeprint/kdeprint_part/Makefile.in kdebase-3.4.0/kdeprint/kdeprint_part/Makefile.in
--- kdebase-3.4.0.orig/kdeprint/kdeprint_part/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdeprint/kdeprint_part/Makefile.in 2005-03-04 19:44:28.000000000 -0500
++++ kdebase-3.4.0/kdeprint/kdeprint_part/Makefile.in 2005-03-18 14:34:18.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26281,11 +28252,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kdeprint/kdeprintfax/Makefile.in kdebase-3.4.0/kdeprint/kdeprintfax/Makefile.in
--- kdebase-3.4.0.orig/kdeprint/kdeprintfax/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdeprint/kdeprintfax/Makefile.in 2005-03-04 19:44:28.000000000 -0500
++++ kdebase-3.4.0/kdeprint/kdeprintfax/Makefile.in 2005-03-18 14:34:18.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26437,11 +28409,12 @@
echo "#define KDE_USE_FINAL 1" >> kdeprintfax.all_cpp.final; \
diff -Nrua kdebase-3.4.0.orig/kdeprint/kjobviewer/Makefile.in kdebase-3.4.0/kdeprint/kjobviewer/Makefile.in
--- kdebase-3.4.0.orig/kdeprint/kjobviewer/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdeprint/kjobviewer/Makefile.in 2005-03-04 19:44:29.000000000 -0500
++++ kdebase-3.4.0/kdeprint/kjobviewer/Makefile.in 2005-03-18 14:34:18.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26545,11 +28518,12 @@
force-reedit:
diff -Nrua kdebase-3.4.0.orig/kdeprint/kprinter/Makefile.in kdebase-3.4.0/kdeprint/kprinter/Makefile.in
--- kdebase-3.4.0.orig/kdeprint/kprinter/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdeprint/kprinter/Makefile.in 2005-03-04 19:44:29.000000000 -0500
++++ kdebase-3.4.0/kdeprint/kprinter/Makefile.in 2005-03-18 14:34:18.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26614,11 +28588,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kdeprint/printmgr/Makefile.in kdebase-3.4.0/kdeprint/printmgr/Makefile.in
--- kdebase-3.4.0.orig/kdeprint/printmgr/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdeprint/printmgr/Makefile.in 2005-03-04 19:44:29.000000000 -0500
++++ kdebase-3.4.0/kdeprint/printmgr/Makefile.in 2005-03-18 14:34:18.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26734,11 +28709,12 @@
force-reedit:
diff -Nrua kdebase-3.4.0.orig/kdeprint/slave/Makefile.in kdebase-3.4.0/kdeprint/slave/Makefile.in
--- kdebase-3.4.0.orig/kdeprint/slave/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdeprint/slave/Makefile.in 2005-03-04 19:44:29.000000000 -0500
++++ kdebase-3.4.0/kdeprint/slave/Makefile.in 2005-03-18 14:34:18.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26851,11 +28827,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/kdeprint/slave/mimetypes/Makefile.in kdebase-3.4.0/kdeprint/slave/mimetypes/Makefile.in
--- kdebase-3.4.0.orig/kdeprint/slave/mimetypes/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdeprint/slave/mimetypes/Makefile.in 2005-03-04 19:44:29.000000000 -0500
++++ kdebase-3.4.0/kdeprint/slave/mimetypes/Makefile.in 2005-03-18 14:34:18.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26895,13 +28872,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -769,7 +772,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kdeprint/slave/templates/Makefile.in kdebase-3.4.0/kdeprint/slave/templates/Makefile.in
--- kdebase-3.4.0.orig/kdeprint/slave/templates/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdeprint/slave/templates/Makefile.in 2005-03-04 19:44:29.000000000 -0500
++++ kdebase-3.4.0/kdeprint/slave/templates/Makefile.in 2005-03-18 14:34:18.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26941,13 +28928,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -796,7 +799,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kdesktop/Makefile.in kdebase-3.4.0/kdesktop/Makefile.in
--- kdebase-3.4.0.orig/kdesktop/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdesktop/Makefile.in 2005-03-04 19:44:29.000000000 -0500
++++ kdebase-3.4.0/kdesktop/Makefile.in 2005-03-18 14:34:18.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -27153,11 +29150,12 @@
echo "#define KDE_USE_FINAL 1" >> libkdeinit_kdesktop_la.all_cpp.final; \
diff -Nrua kdebase-3.4.0.orig/kdesktop/init/Makefile.in kdebase-3.4.0/kdesktop/init/Makefile.in
--- kdebase-3.4.0.orig/kdesktop/init/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdesktop/init/Makefile.in 2005-03-04 19:44:29.000000000 -0500
++++ kdebase-3.4.0/kdesktop/init/Makefile.in 2005-03-18 14:34:18.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -27245,13 +29243,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -945,7 +960,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kdesktop/init/Templates/Makefile.in kdebase-3.4.0/kdesktop/init/Templates/Makefile.in
--- kdebase-3.4.0.orig/kdesktop/init/Templates/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdesktop/init/Templates/Makefile.in 2005-03-04 19:44:29.000000000 -0500
++++ kdebase-3.4.0/kdesktop/init/Templates/Makefile.in 2005-03-18 14:34:18.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -27300,13 +29308,23 @@
#>+ 2
docs-am:
+@@ -807,7 +810,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kdesktop/kwebdesktop/Makefile.in kdebase-3.4.0/kdesktop/kwebdesktop/Makefile.in
--- kdebase-3.4.0.orig/kdesktop/kwebdesktop/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdesktop/kwebdesktop/Makefile.in 2005-03-04 19:44:29.000000000 -0500
++++ kdebase-3.4.0/kdesktop/kwebdesktop/Makefile.in 2005-03-18 14:34:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -27371,11 +29389,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kdesktop/lock/Makefile.in kdebase-3.4.0/kdesktop/lock/Makefile.in
--- kdebase-3.4.0.orig/kdesktop/lock/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdesktop/lock/Makefile.in 2005-03-04 19:44:29.000000000 -0500
++++ kdebase-3.4.0/kdesktop/lock/Makefile.in 2005-03-18 14:34:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -27440,11 +29459,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kdesktop/patterns/Makefile.in kdebase-3.4.0/kdesktop/patterns/Makefile.in
--- kdebase-3.4.0.orig/kdesktop/patterns/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdesktop/patterns/Makefile.in 2005-03-04 19:44:29.000000000 -0500
++++ kdebase-3.4.0/kdesktop/patterns/Makefile.in 2005-03-18 14:34:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -27484,13 +29504,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -770,7 +773,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kdesktop/pics/Makefile.in kdebase-3.4.0/kdesktop/pics/Makefile.in
--- kdebase-3.4.0.orig/kdesktop/pics/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdesktop/pics/Makefile.in 2005-03-04 19:44:29.000000000 -0500
++++ kdebase-3.4.0/kdesktop/pics/Makefile.in 2005-03-18 14:34:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -27530,13 +29560,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -782,7 +785,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kdesktop/programs/Makefile.in kdebase-3.4.0/kdesktop/programs/Makefile.in
--- kdebase-3.4.0.orig/kdesktop/programs/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdesktop/programs/Makefile.in 2005-03-04 19:44:29.000000000 -0500
++++ kdebase-3.4.0/kdesktop/programs/Makefile.in 2005-03-18 14:34:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -27576,13 +29616,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -766,7 +769,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kdesu/Makefile.in kdebase-3.4.0/kdesu/Makefile.in
--- kdebase-3.4.0.orig/kdesu/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdesu/Makefile.in 2005-03-04 19:44:29.000000000 -0500
++++ kdebase-3.4.0/kdesu/Makefile.in 2005-03-18 14:34:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -27670,13 +29720,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -888,7 +903,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kdesu/kdesu/Makefile.in kdebase-3.4.0/kdesu/kdesu/Makefile.in
--- kdebase-3.4.0.orig/kdesu/kdesu/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdesu/kdesu/Makefile.in 2005-03-04 19:44:30.000000000 -0500
++++ kdebase-3.4.0/kdesu/kdesu/Makefile.in 2005-03-18 14:34:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -27741,11 +29801,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kdesu/kdesud/Makefile.in kdebase-3.4.0/kdesu/kdesud/Makefile.in
--- kdebase-3.4.0.orig/kdesu/kdesud/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdesu/kdesud/Makefile.in 2005-03-04 19:44:30.000000000 -0500
++++ kdebase-3.4.0/kdesu/kdesud/Makefile.in 2005-03-18 14:34:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -27810,11 +29871,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kdialog/Makefile.in kdebase-3.4.0/kdialog/Makefile.in
--- kdebase-3.4.0.orig/kdialog/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdialog/Makefile.in 2005-03-04 19:44:30.000000000 -0500
++++ kdebase-3.4.0/kdialog/Makefile.in 2005-03-18 14:34:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -27879,11 +29941,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kdm/Makefile.in kdebase-3.4.0/kdm/Makefile.in
--- kdebase-3.4.0.orig/kdm/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdm/Makefile.in 2005-03-04 19:44:30.000000000 -0500
++++ kdebase-3.4.0/kdm/Makefile.in 2005-03-18 14:34:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -27971,13 +30034,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -935,7 +950,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kdm/backend/Makefile.in kdebase-3.4.0/kdm/backend/Makefile.in
--- kdebase-3.4.0.orig/kdm/backend/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdm/backend/Makefile.in 2005-03-04 19:44:30.000000000 -0500
++++ kdebase-3.4.0/kdm/backend/Makefile.in 2005-03-18 14:34:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -28040,13 +30113,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
+@@ -973,7 +976,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kdm/kfrontend/Makefile.in kdebase-3.4.0/kdm/kfrontend/Makefile.in
--- kdebase-3.4.0.orig/kdm/kfrontend/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdm/kfrontend/Makefile.in 2005-03-04 19:44:30.000000000 -0500
++++ kdebase-3.4.0/kdm/kfrontend/Makefile.in 2005-03-18 14:34:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -28231,11 +30314,12 @@
KDE_DIST=Makefile.in Makefile.am
diff -Nrua kdebase-3.4.0.orig/kdm/kfrontend/pics/Makefile.in kdebase-3.4.0/kdm/kfrontend/pics/Makefile.in
--- kdebase-3.4.0.orig/kdm/kfrontend/pics/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdm/kfrontend/pics/Makefile.in 2005-03-04 19:44:30.000000000 -0500
++++ kdebase-3.4.0/kdm/kfrontend/pics/Makefile.in 2005-03-18 14:34:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -28275,13 +30359,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -788,7 +791,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kdm/kfrontend/sessions/Makefile.in kdebase-3.4.0/kdm/kfrontend/sessions/Makefile.in
--- kdebase-3.4.0.orig/kdm/kfrontend/sessions/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdm/kfrontend/sessions/Makefile.in 2005-03-04 19:44:30.000000000 -0500
++++ kdebase-3.4.0/kdm/kfrontend/sessions/Makefile.in 2005-03-18 14:34:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -28330,13 +30424,23 @@
#>+ 2
docs-am:
+@@ -817,7 +820,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kdm/kfrontend/themer/Makefile.in kdebase-3.4.0/kdm/kfrontend/themer/Makefile.in
--- kdebase-3.4.0.orig/kdm/kfrontend/themer/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdm/kfrontend/themer/Makefile.in 2005-03-04 19:44:30.000000000 -0500
++++ kdebase-3.4.0/kdm/kfrontend/themer/Makefile.in 2005-03-18 14:34:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -28454,11 +30558,12 @@
nmcheck:
diff -Nrua kdebase-3.4.0.orig/kdm/kfrontend/themes/Makefile.in kdebase-3.4.0/kdm/kfrontend/themes/Makefile.in
--- kdebase-3.4.0.orig/kdm/kfrontend/themes/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdm/kfrontend/themes/Makefile.in 2005-03-04 19:44:30.000000000 -0500
++++ kdebase-3.4.0/kdm/kfrontend/themes/Makefile.in 2005-03-18 14:34:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -28546,13 +30651,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -887,7 +902,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kdm/kfrontend/themes/circles/Makefile.in kdebase-3.4.0/kdm/kfrontend/themes/circles/Makefile.in
--- kdebase-3.4.0.orig/kdm/kfrontend/themes/circles/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdm/kfrontend/themes/circles/Makefile.in 2005-03-04 19:44:30.000000000 -0500
++++ kdebase-3.4.0/kdm/kfrontend/themes/circles/Makefile.in 2005-03-18 14:34:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -28592,13 +30707,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -775,7 +778,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kdmlib/Makefile.in kdebase-3.4.0/kdmlib/Makefile.in
--- kdebase-3.4.0.orig/kdmlib/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdmlib/Makefile.in 2005-03-04 19:44:30.000000000 -0500
++++ kdebase-3.4.0/kdmlib/Makefile.in 2005-03-18 14:34:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -28663,11 +30788,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kfind/Makefile.in kdebase-3.4.0/kfind/Makefile.in
--- kdebase-3.4.0.orig/kfind/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kfind/Makefile.in 2005-03-04 19:44:30.000000000 -0500
++++ kdebase-3.4.0/kfind/Makefile.in 2005-03-18 14:34:20.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -28850,11 +30976,12 @@
echo "#define KDE_USE_FINAL 1" >> libkfind_common_la.all_cpp.final; \
diff -Nrua kdebase-3.4.0.orig/kfind/pics/Makefile.in kdebase-3.4.0/kfind/pics/Makefile.in
--- kdebase-3.4.0.orig/kfind/pics/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kfind/pics/Makefile.in 2005-03-04 19:44:30.000000000 -0500
++++ kdebase-3.4.0/kfind/pics/Makefile.in 2005-03-18 14:34:20.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -28920,13 +31047,23 @@
-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/search.png
#>+ 15
+@@ -760,7 +763,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/khelpcenter/Makefile.in kdebase-3.4.0/khelpcenter/Makefile.in
--- kdebase-3.4.0.orig/khelpcenter/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khelpcenter/Makefile.in 2005-03-04 19:44:31.000000000 -0500
++++ kdebase-3.4.0/khelpcenter/Makefile.in 2005-03-18 14:34:20.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -29252,11 +31389,12 @@
mainwindow.o: mainwindow.moc
diff -Nrua kdebase-3.4.0.orig/khelpcenter/htmlsearch/Makefile.in kdebase-3.4.0/khelpcenter/htmlsearch/Makefile.in
--- kdebase-3.4.0.orig/khelpcenter/htmlsearch/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khelpcenter/htmlsearch/Makefile.in 2005-03-04 19:44:31.000000000 -0500
++++ kdebase-3.4.0/khelpcenter/htmlsearch/Makefile.in 2005-03-18 14:34:20.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -29321,11 +31459,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/khelpcenter/pics/Makefile.in kdebase-3.4.0/khelpcenter/pics/Makefile.in
--- kdebase-3.4.0.orig/khelpcenter/pics/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khelpcenter/pics/Makefile.in 2005-03-04 19:44:31.000000000 -0500
++++ kdebase-3.4.0/khelpcenter/pics/Makefile.in 2005-03-18 14:34:20.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -29407,13 +31546,23 @@
#>+ 15
force-reedit:
+@@ -767,7 +770,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/khelpcenter/plugins/Applications/Makefile.in kdebase-3.4.0/khelpcenter/plugins/Applications/Makefile.in
--- kdebase-3.4.0.orig/khelpcenter/plugins/Applications/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khelpcenter/plugins/Applications/Makefile.in 2005-03-04 19:44:31.000000000 -0500
++++ kdebase-3.4.0/khelpcenter/plugins/Applications/Makefile.in 2005-03-18 14:34:20.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -29453,13 +31602,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -767,7 +770,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/khelpcenter/plugins/Makefile.in kdebase-3.4.0/khelpcenter/plugins/Makefile.in
--- kdebase-3.4.0.orig/khelpcenter/plugins/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khelpcenter/plugins/Makefile.in 2005-03-04 19:44:31.000000000 -0500
++++ kdebase-3.4.0/khelpcenter/plugins/Makefile.in 2005-03-18 14:34:20.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -29547,13 +31706,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -924,7 +939,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/khelpcenter/plugins/Manpages/Makefile.in kdebase-3.4.0/khelpcenter/plugins/Manpages/Makefile.in
--- kdebase-3.4.0.orig/khelpcenter/plugins/Manpages/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khelpcenter/plugins/Manpages/Makefile.in 2005-03-04 19:44:31.000000000 -0500
++++ kdebase-3.4.0/khelpcenter/plugins/Manpages/Makefile.in 2005-03-18 14:34:20.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -29593,13 +31762,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -769,7 +772,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/khelpcenter/plugins/Scrollkeeper/Makefile.in kdebase-3.4.0/khelpcenter/plugins/Scrollkeeper/Makefile.in
--- kdebase-3.4.0.orig/khelpcenter/plugins/Scrollkeeper/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khelpcenter/plugins/Scrollkeeper/Makefile.in 2005-03-04 19:44:31.000000000 -0500
++++ kdebase-3.4.0/khelpcenter/plugins/Scrollkeeper/Makefile.in 2005-03-18 14:34:20.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -29639,13 +31818,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -767,7 +770,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/khelpcenter/plugins/Tutorials/Makefile.in kdebase-3.4.0/khelpcenter/plugins/Tutorials/Makefile.in
--- kdebase-3.4.0.orig/khelpcenter/plugins/Tutorials/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khelpcenter/plugins/Tutorials/Makefile.in 2005-03-04 19:44:31.000000000 -0500
++++ kdebase-3.4.0/khelpcenter/plugins/Tutorials/Makefile.in 2005-03-18 14:34:20.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -29685,13 +31874,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -766,7 +769,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/khelpcenter/searchhandlers/Makefile.in kdebase-3.4.0/khelpcenter/searchhandlers/Makefile.in
--- kdebase-3.4.0.orig/khelpcenter/searchhandlers/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khelpcenter/searchhandlers/Makefile.in 2005-03-04 19:44:31.000000000 -0500
++++ kdebase-3.4.0/khelpcenter/searchhandlers/Makefile.in 2005-03-18 14:34:20.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -29731,13 +31930,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_binSCRIPTS: $(kde_bin_SCRIPTS)
@$(NORMAL_INSTALL)
+@@ -817,7 +820,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/khotkeys/Makefile.in kdebase-3.4.0/khotkeys/Makefile.in
--- kdebase-3.4.0.orig/khotkeys/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khotkeys/Makefile.in 2005-03-04 19:44:31.000000000 -0500
++++ kdebase-3.4.0/khotkeys/Makefile.in 2005-03-18 14:34:20.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -29825,13 +32034,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -926,7 +941,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/khotkeys/app/Makefile.in kdebase-3.4.0/khotkeys/app/Makefile.in
--- kdebase-3.4.0.orig/khotkeys/app/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khotkeys/app/Makefile.in 2005-03-04 19:44:31.000000000 -0500
++++ kdebase-3.4.0/khotkeys/app/Makefile.in 2005-03-18 14:34:21.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -29896,11 +32115,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/khotkeys/data/Makefile.in kdebase-3.4.0/khotkeys/data/Makefile.in
--- kdebase-3.4.0.orig/khotkeys/data/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khotkeys/data/Makefile.in 2005-03-04 19:44:32.000000000 -0500
++++ kdebase-3.4.0/khotkeys/data/Makefile.in 2005-03-18 14:34:21.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -29940,13 +32160,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -791,7 +794,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/khotkeys/kcontrol/Makefile.in kdebase-3.4.0/khotkeys/kcontrol/Makefile.in
--- kdebase-3.4.0.orig/khotkeys/kcontrol/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/khotkeys/kcontrol/Makefile.in 2005-03-04 19:44:33.000000000 -0500
++++ kdebase-3.4.0/khotkeys/kcontrol/Makefile.in 2005-03-18 14:34:22.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -30201,11 +32431,12 @@
windowselector.o: windowselector.moc
diff -Nrua kdebase-3.4.0.orig/khotkeys/kcontrol/ui/Makefile.in kdebase-3.4.0/khotkeys/kcontrol/ui/Makefile.in
--- kdebase-3.4.0.orig/khotkeys/kcontrol/ui/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/khotkeys/kcontrol/ui/Makefile.in 2005-03-04 19:44:33.000000000 -0500
++++ kdebase-3.4.0/khotkeys/kcontrol/ui/Makefile.in 2005-03-18 14:34:22.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -30279,11 +32510,12 @@
clean-ui:
diff -Nrua kdebase-3.4.0.orig/khotkeys/shared/Makefile.in kdebase-3.4.0/khotkeys/shared/Makefile.in
--- kdebase-3.4.0.orig/khotkeys/shared/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/khotkeys/shared/Makefile.in 2005-03-04 19:44:33.000000000 -0500
++++ kdebase-3.4.0/khotkeys/shared/Makefile.in 2005-03-18 14:34:23.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -30387,11 +32619,12 @@
echo "#define KDE_USE_FINAL 1" >> libshared_la.all_cpp.final; \
diff -Nrua kdebase-3.4.0.orig/khotkeys/update/Makefile.in kdebase-3.4.0/khotkeys/update/Makefile.in
--- kdebase-3.4.0.orig/khotkeys/update/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/khotkeys/update/Makefile.in 2005-03-04 19:44:33.000000000 -0500
++++ kdebase-3.4.0/khotkeys/update/Makefile.in 2005-03-18 14:34:23.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -30456,11 +32689,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kicker/Makefile.in kdebase-3.4.0/kicker/Makefile.in
--- kdebase-3.4.0.orig/kicker/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/Makefile.in 2005-03-04 19:44:33.000000000 -0500
++++ kdebase-3.4.0/kicker/Makefile.in 2005-03-18 14:34:23.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -30573,11 +32807,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/kicker/applets/Makefile.in kdebase-3.4.0/kicker/applets/Makefile.in
--- kdebase-3.4.0.orig/kicker/applets/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/Makefile.in 2005-03-04 19:44:33.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/Makefile.in 2005-03-18 14:34:23.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -30665,13 +32900,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -887,7 +902,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kicker/applets/clock/Makefile.in kdebase-3.4.0/kicker/applets/clock/Makefile.in
--- kdebase-3.4.0.orig/kicker/applets/clock/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/clock/Makefile.in 2005-03-04 19:44:33.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/clock/Makefile.in 2005-03-18 14:34:23.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -30736,11 +32981,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kicker/applets/launcher/Makefile.in kdebase-3.4.0/kicker/applets/launcher/Makefile.in
--- kdebase-3.4.0.orig/kicker/applets/launcher/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/launcher/Makefile.in 2005-03-04 19:44:33.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/launcher/Makefile.in 2005-03-18 14:34:23.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -30805,11 +33051,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kicker/applets/lockout/Makefile.in kdebase-3.4.0/kicker/applets/lockout/Makefile.in
--- kdebase-3.4.0.orig/kicker/applets/lockout/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/lockout/Makefile.in 2005-03-04 19:44:33.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/lockout/Makefile.in 2005-03-18 14:34:23.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -30874,11 +33121,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kicker/applets/media/Makefile.in kdebase-3.4.0/kicker/applets/media/Makefile.in
--- kdebase-3.4.0.orig/kicker/applets/media/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/media/Makefile.in 2005-03-04 19:44:33.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/media/Makefile.in 2005-03-18 14:34:23.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -30986,11 +33234,12 @@
echo "#define KDE_USE_FINAL 1" >> media_panelapplet_la.all_cpp.final; \
diff -Nrua kdebase-3.4.0.orig/kicker/applets/menu/Makefile.in kdebase-3.4.0/kicker/applets/menu/Makefile.in
--- kdebase-3.4.0.orig/kicker/applets/menu/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/menu/Makefile.in 2005-03-04 19:44:33.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/menu/Makefile.in 2005-03-18 14:34:23.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -31055,11 +33304,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kicker/applets/minipager/Makefile.in kdebase-3.4.0/kicker/applets/minipager/Makefile.in
--- kdebase-3.4.0.orig/kicker/applets/minipager/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/minipager/Makefile.in 2005-03-04 19:44:33.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/minipager/Makefile.in 2005-03-18 14:34:23.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -31124,11 +33374,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kicker/applets/naughty/Makefile.in kdebase-3.4.0/kicker/applets/naughty/Makefile.in
--- kdebase-3.4.0.orig/kicker/applets/naughty/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/naughty/Makefile.in 2005-03-04 19:44:33.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/naughty/Makefile.in 2005-03-18 14:34:23.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -31193,11 +33444,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kicker/applets/run/Makefile.in kdebase-3.4.0/kicker/applets/run/Makefile.in
--- kdebase-3.4.0.orig/kicker/applets/run/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/run/Makefile.in 2005-03-04 19:44:33.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/run/Makefile.in 2005-03-18 14:34:23.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -31262,11 +33514,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kicker/applets/swallow/Makefile.in kdebase-3.4.0/kicker/applets/swallow/Makefile.in
--- kdebase-3.4.0.orig/kicker/applets/swallow/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/swallow/Makefile.in 2005-03-04 19:44:34.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/swallow/Makefile.in 2005-03-18 14:34:23.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -31380,11 +33633,12 @@
diff -Nrua kdebase-3.4.0.orig/kicker/applets/systemtray/Makefile.in kdebase-3.4.0/kicker/applets/systemtray/Makefile.in
--- kdebase-3.4.0.orig/kicker/applets/systemtray/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/systemtray/Makefile.in 2005-03-04 19:44:34.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/systemtray/Makefile.in 2005-03-18 14:34:23.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -31449,11 +33703,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kicker/applets/taskbar/Makefile.in kdebase-3.4.0/kicker/applets/taskbar/Makefile.in
--- kdebase-3.4.0.orig/kicker/applets/taskbar/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/taskbar/Makefile.in 2005-03-04 19:44:34.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/taskbar/Makefile.in 2005-03-18 14:34:23.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -31518,11 +33773,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kicker/applets/trash/Makefile.in kdebase-3.4.0/kicker/applets/trash/Makefile.in
--- kdebase-3.4.0.orig/kicker/applets/trash/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/trash/Makefile.in 2005-03-04 19:44:34.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/trash/Makefile.in 2005-03-18 14:34:23.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -31587,11 +33843,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kicker/buttons/Makefile.in kdebase-3.4.0/kicker/buttons/Makefile.in
--- kdebase-3.4.0.orig/kicker/buttons/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/buttons/Makefile.in 2005-03-04 19:44:34.000000000 -0500
++++ kdebase-3.4.0/kicker/buttons/Makefile.in 2005-03-18 14:34:23.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -31737,11 +33994,12 @@
kbutton.o: kbutton.moc
diff -Nrua kdebase-3.4.0.orig/kicker/core/Makefile.in kdebase-3.4.0/kicker/core/Makefile.in
--- kdebase-3.4.0.orig/kicker/core/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/core/Makefile.in 2005-03-04 19:44:34.000000000 -0500
++++ kdebase-3.4.0/kicker/core/Makefile.in 2005-03-18 14:34:24.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -31874,11 +34132,12 @@
echo "#define KDE_USE_FINAL 1" >> libkicker_core_la.all_cpp.final; \
diff -Nrua kdebase-3.4.0.orig/kicker/data/Makefile.in kdebase-3.4.0/kicker/data/Makefile.in
--- kdebase-3.4.0.orig/kicker/data/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/data/Makefile.in 2005-03-04 19:44:34.000000000 -0500
++++ kdebase-3.4.0/kicker/data/Makefile.in 2005-03-18 14:34:24.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -31966,13 +34225,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -887,7 +902,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kicker/data/app_start_anim/Makefile.in kdebase-3.4.0/kicker/data/app_start_anim/Makefile.in
--- kdebase-3.4.0.orig/kicker/data/app_start_anim/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/data/app_start_anim/Makefile.in 2005-03-04 19:44:34.000000000 -0500
++++ kdebase-3.4.0/kicker/data/app_start_anim/Makefile.in 2005-03-18 14:34:24.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -32012,13 +34281,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -770,7 +773,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kicker/data/icons/Makefile.in kdebase-3.4.0/kicker/data/icons/Makefile.in
--- kdebase-3.4.0.orig/kicker/data/icons/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/data/icons/Makefile.in 2005-03-04 19:44:34.000000000 -0500
++++ kdebase-3.4.0/kicker/data/icons/Makefile.in 2005-03-18 14:34:24.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -32178,13 +34457,23 @@
#>+ 15
force-reedit:
+@@ -934,7 +949,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kicker/data/icons/actions/Makefile.in kdebase-3.4.0/kicker/data/icons/actions/Makefile.in
--- kdebase-3.4.0.orig/kicker/data/icons/actions/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/data/icons/actions/Makefile.in 2005-03-04 19:44:34.000000000 -0500
++++ kdebase-3.4.0/kicker/data/icons/actions/Makefile.in 2005-03-18 14:34:24.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -32224,13 +34513,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -751,7 +754,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kicker/data/kmenu_side/Makefile.in kdebase-3.4.0/kicker/data/kmenu_side/Makefile.in
--- kdebase-3.4.0.orig/kicker/data/kmenu_side/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/data/kmenu_side/Makefile.in 2005-03-04 19:44:34.000000000 -0500
++++ kdebase-3.4.0/kicker/data/kmenu_side/Makefile.in 2005-03-18 14:34:24.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -32270,13 +34569,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -770,7 +773,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kicker/data/tiles/Makefile.in kdebase-3.4.0/kicker/data/tiles/Makefile.in
--- kdebase-3.4.0.orig/kicker/data/tiles/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/data/tiles/Makefile.in 2005-03-04 19:44:34.000000000 -0500
++++ kdebase-3.4.0/kicker/data/tiles/Makefile.in 2005-03-18 14:34:24.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -32325,13 +34634,23 @@
#>+ 2
docs-am:
+@@ -819,7 +822,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kicker/data/wallpaper/Makefile.in kdebase-3.4.0/kicker/data/wallpaper/Makefile.in
--- kdebase-3.4.0.orig/kicker/data/wallpaper/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/data/wallpaper/Makefile.in 2005-03-04 19:44:34.000000000 -0500
++++ kdebase-3.4.0/kicker/data/wallpaper/Makefile.in 2005-03-18 14:34:24.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -32371,13 +34690,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -768,7 +771,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kicker/extensions/Makefile.in kdebase-3.4.0/kicker/extensions/Makefile.in
--- kdebase-3.4.0.orig/kicker/extensions/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/extensions/Makefile.in 2005-03-04 19:44:34.000000000 -0500
++++ kdebase-3.4.0/kicker/extensions/Makefile.in 2005-03-18 14:34:24.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -32465,13 +34794,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -887,7 +902,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kicker/extensions/dockbar/Makefile.in kdebase-3.4.0/kicker/extensions/dockbar/Makefile.in
--- kdebase-3.4.0.orig/kicker/extensions/dockbar/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/extensions/dockbar/Makefile.in 2005-03-04 19:44:34.000000000 -0500
++++ kdebase-3.4.0/kicker/extensions/dockbar/Makefile.in 2005-03-18 14:34:24.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -32536,11 +34875,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kicker/extensions/kasbar/Makefile.in kdebase-3.4.0/kicker/extensions/kasbar/Makefile.in
--- kdebase-3.4.0.orig/kicker/extensions/kasbar/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/extensions/kasbar/Makefile.in 2005-03-04 19:44:35.000000000 -0500
++++ kdebase-3.4.0/kicker/extensions/kasbar/Makefile.in 2005-03-18 14:34:24.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -32653,11 +34993,12 @@
echo "#define KDE_USE_FINAL 1" >> libkasbar_la.all_cpp.final; \
diff -Nrua kdebase-3.4.0.orig/kicker/extensions/sidebar/Makefile.in kdebase-3.4.0/kicker/extensions/sidebar/Makefile.in
--- kdebase-3.4.0.orig/kicker/extensions/sidebar/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/extensions/sidebar/Makefile.in 2005-03-04 19:44:35.000000000 -0500
++++ kdebase-3.4.0/kicker/extensions/sidebar/Makefile.in 2005-03-18 14:34:24.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -32722,11 +35063,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kicker/extensions/taskbar/Makefile.in kdebase-3.4.0/kicker/extensions/taskbar/Makefile.in
--- kdebase-3.4.0.orig/kicker/extensions/taskbar/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/extensions/taskbar/Makefile.in 2005-03-04 19:44:35.000000000 -0500
++++ kdebase-3.4.0/kicker/extensions/taskbar/Makefile.in 2005-03-18 14:34:24.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -32791,11 +35133,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kicker/menuext/Makefile.in kdebase-3.4.0/kicker/menuext/Makefile.in
--- kdebase-3.4.0.orig/kicker/menuext/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/menuext/Makefile.in 2005-03-04 19:44:35.000000000 -0500
++++ kdebase-3.4.0/kicker/menuext/Makefile.in 2005-03-18 14:34:24.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -32883,13 +35226,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -887,7 +902,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kicker/menuext/find/Makefile.in kdebase-3.4.0/kicker/menuext/find/Makefile.in
--- kdebase-3.4.0.orig/kicker/menuext/find/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/menuext/find/Makefile.in 2005-03-04 19:44:35.000000000 -0500
++++ kdebase-3.4.0/kicker/menuext/find/Makefile.in 2005-03-18 14:34:24.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -32954,11 +35307,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kicker/menuext/kdeprint/Makefile.in kdebase-3.4.0/kicker/menuext/kdeprint/Makefile.in
--- kdebase-3.4.0.orig/kicker/menuext/kdeprint/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/menuext/kdeprint/Makefile.in 2005-03-04 19:44:35.000000000 -0500
++++ kdebase-3.4.0/kicker/menuext/kdeprint/Makefile.in 2005-03-18 14:34:24.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -33023,11 +35377,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kicker/menuext/konq-profiles/Makefile.in kdebase-3.4.0/kicker/menuext/konq-profiles/Makefile.in
--- kdebase-3.4.0.orig/kicker/menuext/konq-profiles/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/menuext/konq-profiles/Makefile.in 2005-03-04 19:44:35.000000000 -0500
++++ kdebase-3.4.0/kicker/menuext/konq-profiles/Makefile.in 2005-03-18 14:34:24.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -33092,11 +35447,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kicker/menuext/konsole/Makefile.in kdebase-3.4.0/kicker/menuext/konsole/Makefile.in
--- kdebase-3.4.0.orig/kicker/menuext/konsole/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/menuext/konsole/Makefile.in 2005-03-04 19:44:35.000000000 -0500
++++ kdebase-3.4.0/kicker/menuext/konsole/Makefile.in 2005-03-18 14:34:24.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -33161,11 +35517,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kicker/menuext/prefmenu/Makefile.in kdebase-3.4.0/kicker/menuext/prefmenu/Makefile.in
--- kdebase-3.4.0.orig/kicker/menuext/prefmenu/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/menuext/prefmenu/Makefile.in 2005-03-04 19:44:35.000000000 -0500
++++ kdebase-3.4.0/kicker/menuext/prefmenu/Makefile.in 2005-03-18 14:34:25.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -33230,11 +35587,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kicker/menuext/recentdocs/Makefile.in kdebase-3.4.0/kicker/menuext/recentdocs/Makefile.in
--- kdebase-3.4.0.orig/kicker/menuext/recentdocs/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/menuext/recentdocs/Makefile.in 2005-03-04 19:44:35.000000000 -0500
++++ kdebase-3.4.0/kicker/menuext/recentdocs/Makefile.in 2005-03-18 14:34:25.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -33299,11 +35657,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kicker/menuext/remote/Makefile.in kdebase-3.4.0/kicker/menuext/remote/Makefile.in
--- kdebase-3.4.0.orig/kicker/menuext/remote/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/menuext/remote/Makefile.in 2005-03-04 19:44:35.000000000 -0500
++++ kdebase-3.4.0/kicker/menuext/remote/Makefile.in 2005-03-18 14:34:25.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -33368,11 +35727,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kicker/menuext/system/Makefile.in kdebase-3.4.0/kicker/menuext/system/Makefile.in
--- kdebase-3.4.0.orig/kicker/menuext/system/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/menuext/system/Makefile.in 2005-03-04 19:44:35.000000000 -0500
++++ kdebase-3.4.0/kicker/menuext/system/Makefile.in 2005-03-18 14:34:25.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -33437,11 +35797,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kicker/menuext/tom/Makefile.in kdebase-3.4.0/kicker/menuext/tom/Makefile.in
--- kdebase-3.4.0.orig/kicker/menuext/tom/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/menuext/tom/Makefile.in 2005-03-04 19:44:35.000000000 -0500
++++ kdebase-3.4.0/kicker/menuext/tom/Makefile.in 2005-03-18 14:34:25.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -33506,11 +35867,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kicker/proxy/Makefile.in kdebase-3.4.0/kicker/proxy/Makefile.in
--- kdebase-3.4.0.orig/kicker/proxy/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/proxy/Makefile.in 2005-03-04 19:44:35.000000000 -0500
++++ kdebase-3.4.0/kicker/proxy/Makefile.in 2005-03-18 14:34:25.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -33575,11 +35937,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kicker/share/Makefile.in kdebase-3.4.0/kicker/share/Makefile.in
--- kdebase-3.4.0.orig/kicker/share/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/share/Makefile.in 2005-03-04 19:44:35.000000000 -0500
++++ kdebase-3.4.0/kicker/share/Makefile.in 2005-03-18 14:34:25.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -33644,11 +36007,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kicker/taskbar/Makefile.in kdebase-3.4.0/kicker/taskbar/Makefile.in
--- kdebase-3.4.0.orig/kicker/taskbar/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/taskbar/Makefile.in 2005-03-04 19:44:36.000000000 -0500
++++ kdebase-3.4.0/kicker/taskbar/Makefile.in 2005-03-18 14:34:25.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -33713,11 +36077,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kicker/taskmanager/Makefile.in kdebase-3.4.0/kicker/taskmanager/Makefile.in
--- kdebase-3.4.0.orig/kicker/taskmanager/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/taskmanager/Makefile.in 2005-03-04 19:44:36.000000000 -0500
++++ kdebase-3.4.0/kicker/taskmanager/Makefile.in 2005-03-18 14:34:25.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -33782,11 +36147,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kicker/ui/Makefile.in kdebase-3.4.0/kicker/ui/Makefile.in
--- kdebase-3.4.0.orig/kicker/ui/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kicker/ui/Makefile.in 2005-03-04 19:44:36.000000000 -0500
++++ kdebase-3.4.0/kicker/ui/Makefile.in 2005-03-18 14:34:25.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -33919,11 +36285,12 @@
echo "#define KDE_USE_FINAL 1" >> libkicker_ui_la.all_cpp.final; \
diff -Nrua kdebase-3.4.0.orig/kioslave/Makefile.in kdebase-3.4.0/kioslave/Makefile.in
--- kdebase-3.4.0.orig/kioslave/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/Makefile.in 2005-03-04 19:44:36.000000000 -0500
++++ kdebase-3.4.0/kioslave/Makefile.in 2005-03-18 14:34:25.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -34011,13 +36378,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -894,7 +909,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kioslave/about/Makefile.in kdebase-3.4.0/kioslave/about/Makefile.in
--- kdebase-3.4.0.orig/kioslave/about/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/about/Makefile.in 2005-03-04 19:44:36.000000000 -0500
++++ kdebase-3.4.0/kioslave/about/Makefile.in 2005-03-18 14:34:25.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -34082,11 +36459,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kioslave/cgi/Makefile.in kdebase-3.4.0/kioslave/cgi/Makefile.in
--- kdebase-3.4.0.orig/kioslave/cgi/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/cgi/Makefile.in 2005-03-04 19:44:36.000000000 -0500
++++ kdebase-3.4.0/kioslave/cgi/Makefile.in 2005-03-18 14:34:25.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -34199,11 +36577,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/kioslave/cgi/kcmcgi/Makefile.in kdebase-3.4.0/kioslave/cgi/kcmcgi/Makefile.in
--- kdebase-3.4.0.orig/kioslave/cgi/kcmcgi/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/cgi/kcmcgi/Makefile.in 2005-03-04 19:44:36.000000000 -0500
++++ kdebase-3.4.0/kioslave/cgi/kcmcgi/Makefile.in 2005-03-18 14:34:25.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -34268,11 +36647,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kioslave/filter/Makefile.in kdebase-3.4.0/kioslave/filter/Makefile.in
--- kdebase-3.4.0.orig/kioslave/filter/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/filter/Makefile.in 2005-03-04 19:44:36.000000000 -0500
++++ kdebase-3.4.0/kioslave/filter/Makefile.in 2005-03-18 14:34:25.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -34337,11 +36717,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kioslave/finger/Makefile.in kdebase-3.4.0/kioslave/finger/Makefile.in
--- kdebase-3.4.0.orig/kioslave/finger/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/finger/Makefile.in 2005-03-04 19:44:36.000000000 -0500
++++ kdebase-3.4.0/kioslave/finger/Makefile.in 2005-03-18 14:34:25.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -34406,11 +36787,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kioslave/fish/Makefile.in kdebase-3.4.0/kioslave/fish/Makefile.in
--- kdebase-3.4.0.orig/kioslave/fish/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/fish/Makefile.in 2005-03-04 19:44:36.000000000 -0500
++++ kdebase-3.4.0/kioslave/fish/Makefile.in 2005-03-18 14:34:25.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -34475,11 +36857,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kioslave/floppy/Makefile.in kdebase-3.4.0/kioslave/floppy/Makefile.in
--- kdebase-3.4.0.orig/kioslave/floppy/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/floppy/Makefile.in 2005-03-04 19:44:36.000000000 -0500
++++ kdebase-3.4.0/kioslave/floppy/Makefile.in 2005-03-18 14:34:26.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -34544,11 +36927,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kioslave/info/Makefile.in kdebase-3.4.0/kioslave/info/Makefile.in
--- kdebase-3.4.0.orig/kioslave/info/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/info/Makefile.in 2005-03-04 19:44:36.000000000 -0500
++++ kdebase-3.4.0/kioslave/info/Makefile.in 2005-03-18 14:34:26.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -34613,11 +36997,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kioslave/ldap/Makefile.in kdebase-3.4.0/kioslave/ldap/Makefile.in
--- kdebase-3.4.0.orig/kioslave/ldap/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/ldap/Makefile.in 2005-03-04 19:44:36.000000000 -0500
++++ kdebase-3.4.0/kioslave/ldap/Makefile.in 2005-03-18 14:34:26.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -34682,11 +37067,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kioslave/mac/Makefile.in kdebase-3.4.0/kioslave/mac/Makefile.in
--- kdebase-3.4.0.orig/kioslave/mac/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/mac/Makefile.in 2005-03-04 19:44:36.000000000 -0500
++++ kdebase-3.4.0/kioslave/mac/Makefile.in 2005-03-18 14:34:26.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -34751,11 +37137,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kioslave/man/Makefile.in kdebase-3.4.0/kioslave/man/Makefile.in
--- kdebase-3.4.0.orig/kioslave/man/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/man/Makefile.in 2005-03-04 19:44:36.000000000 -0500
++++ kdebase-3.4.0/kioslave/man/Makefile.in 2005-03-18 14:34:26.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -34820,11 +37207,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kioslave/media/Makefile.in kdebase-3.4.0/kioslave/media/Makefile.in
--- kdebase-3.4.0.orig/kioslave/media/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/media/Makefile.in 2005-03-04 19:44:36.000000000 -0500
++++ kdebase-3.4.0/kioslave/media/Makefile.in 2005-03-18 14:34:26.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -34937,11 +37325,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/kioslave/media/kdedmodule/Makefile.in kdebase-3.4.0/kioslave/media/kdedmodule/Makefile.in
--- kdebase-3.4.0.orig/kioslave/media/kdedmodule/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/media/kdedmodule/Makefile.in 2005-03-04 19:44:37.000000000 -0500
++++ kdebase-3.4.0/kioslave/media/kdedmodule/Makefile.in 2005-03-18 14:34:26.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -35006,11 +37395,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kioslave/media/kfile-plugin/Makefile.in kdebase-3.4.0/kioslave/media/kfile-plugin/Makefile.in
--- kdebase-3.4.0.orig/kioslave/media/kfile-plugin/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/media/kfile-plugin/Makefile.in 2005-03-04 19:44:37.000000000 -0500
++++ kdebase-3.4.0/kioslave/media/kfile-plugin/Makefile.in 2005-03-18 14:34:26.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -35075,11 +37465,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kioslave/media/libmediacommon/Makefile.in kdebase-3.4.0/kioslave/media/libmediacommon/Makefile.in
--- kdebase-3.4.0.orig/kioslave/media/libmediacommon/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/media/libmediacommon/Makefile.in 2005-03-04 19:44:37.000000000 -0500
++++ kdebase-3.4.0/kioslave/media/libmediacommon/Makefile.in 2005-03-18 14:34:26.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -35144,11 +37535,12 @@
clean-noinstLTLIBRARIES:
diff -Nrua kdebase-3.4.0.orig/kioslave/media/mimetypes/Makefile.in kdebase-3.4.0/kioslave/media/mimetypes/Makefile.in
--- kdebase-3.4.0.orig/kioslave/media/mimetypes/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/media/mimetypes/Makefile.in 2005-03-04 19:44:37.000000000 -0500
++++ kdebase-3.4.0/kioslave/media/mimetypes/Makefile.in 2005-03-18 14:34:26.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -35188,13 +37580,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -785,7 +788,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kioslave/media/mounthelper/Makefile.in kdebase-3.4.0/kioslave/media/mounthelper/Makefile.in
--- kdebase-3.4.0.orig/kioslave/media/mounthelper/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/media/mounthelper/Makefile.in 2005-03-04 19:44:37.000000000 -0500
++++ kdebase-3.4.0/kioslave/media/mounthelper/Makefile.in 2005-03-18 14:34:26.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -35259,11 +37661,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kioslave/media/services/Makefile.in kdebase-3.4.0/kioslave/media/services/Makefile.in
--- kdebase-3.4.0.orig/kioslave/media/services/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/media/services/Makefile.in 2005-03-04 19:44:37.000000000 -0500
++++ kdebase-3.4.0/kioslave/media/services/Makefile.in 2005-03-18 14:34:26.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -35303,13 +37706,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -767,7 +770,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kioslave/nfs/Makefile.in kdebase-3.4.0/kioslave/nfs/Makefile.in
--- kdebase-3.4.0.orig/kioslave/nfs/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/nfs/Makefile.in 2005-03-04 19:44:37.000000000 -0500
++++ kdebase-3.4.0/kioslave/nfs/Makefile.in 2005-03-18 14:34:26.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -35387,11 +37800,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kioslave/nntp/Makefile.in kdebase-3.4.0/kioslave/nntp/Makefile.in
--- kdebase-3.4.0.orig/kioslave/nntp/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/nntp/Makefile.in 2005-03-04 19:44:37.000000000 -0500
++++ kdebase-3.4.0/kioslave/nntp/Makefile.in 2005-03-18 14:34:26.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -35456,11 +37870,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kioslave/pop3/Makefile.in kdebase-3.4.0/kioslave/pop3/Makefile.in
--- kdebase-3.4.0.orig/kioslave/pop3/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/pop3/Makefile.in 2005-03-04 19:44:37.000000000 -0500
++++ kdebase-3.4.0/kioslave/pop3/Makefile.in 2005-03-18 14:34:26.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -35525,11 +37940,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kioslave/remote/Makefile.in kdebase-3.4.0/kioslave/remote/Makefile.in
--- kdebase-3.4.0.orig/kioslave/remote/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/remote/Makefile.in 2005-03-04 19:44:37.000000000 -0500
++++ kdebase-3.4.0/kioslave/remote/Makefile.in 2005-03-18 14:34:26.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -35642,11 +38058,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/kioslave/remote/kdedmodule/Makefile.in kdebase-3.4.0/kioslave/remote/kdedmodule/Makefile.in
--- kdebase-3.4.0.orig/kioslave/remote/kdedmodule/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/remote/kdedmodule/Makefile.in 2005-03-04 19:44:37.000000000 -0500
++++ kdebase-3.4.0/kioslave/remote/kdedmodule/Makefile.in 2005-03-18 14:34:26.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -35711,11 +38128,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kioslave/settings/Makefile.in kdebase-3.4.0/kioslave/settings/Makefile.in
--- kdebase-3.4.0.orig/kioslave/settings/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/settings/Makefile.in 2005-03-04 19:44:37.000000000 -0500
++++ kdebase-3.4.0/kioslave/settings/Makefile.in 2005-03-18 14:34:26.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -35828,11 +38246,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/kioslave/sftp/Makefile.in kdebase-3.4.0/kioslave/sftp/Makefile.in
--- kdebase-3.4.0.orig/kioslave/sftp/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/sftp/Makefile.in 2005-03-04 19:44:37.000000000 -0500
++++ kdebase-3.4.0/kioslave/sftp/Makefile.in 2005-03-18 14:34:26.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -35897,11 +38316,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kioslave/smb/Makefile.in kdebase-3.4.0/kioslave/smb/Makefile.in
--- kdebase-3.4.0.orig/kioslave/smb/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/smb/Makefile.in 2005-03-04 19:44:38.000000000 -0500
++++ kdebase-3.4.0/kioslave/smb/Makefile.in 2005-03-18 14:34:27.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -35966,11 +38386,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kioslave/smtp/Makefile.in kdebase-3.4.0/kioslave/smtp/Makefile.in
--- kdebase-3.4.0.orig/kioslave/smtp/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/smtp/Makefile.in 2005-03-04 19:44:38.000000000 -0500
++++ kdebase-3.4.0/kioslave/smtp/Makefile.in 2005-03-18 14:34:27.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -36035,11 +38456,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kioslave/system/Makefile.in kdebase-3.4.0/kioslave/system/Makefile.in
--- kdebase-3.4.0.orig/kioslave/system/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/system/Makefile.in 2005-03-04 19:44:38.000000000 -0500
++++ kdebase-3.4.0/kioslave/system/Makefile.in 2005-03-18 14:34:27.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -36152,11 +38574,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/kioslave/system/entries/Makefile.in kdebase-3.4.0/kioslave/system/entries/Makefile.in
--- kdebase-3.4.0.orig/kioslave/system/entries/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/system/entries/Makefile.in 2005-03-04 19:44:38.000000000 -0500
++++ kdebase-3.4.0/kioslave/system/entries/Makefile.in 2005-03-18 14:34:27.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -36196,13 +38619,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -767,7 +770,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kioslave/system/kdedmodule/Makefile.in kdebase-3.4.0/kioslave/system/kdedmodule/Makefile.in
--- kdebase-3.4.0.orig/kioslave/system/kdedmodule/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/system/kdedmodule/Makefile.in 2005-03-04 19:44:38.000000000 -0500
++++ kdebase-3.4.0/kioslave/system/kdedmodule/Makefile.in 2005-03-18 14:34:27.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -36267,11 +38700,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kioslave/system/mimetypes/Makefile.in kdebase-3.4.0/kioslave/system/mimetypes/Makefile.in
--- kdebase-3.4.0.orig/kioslave/system/mimetypes/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/system/mimetypes/Makefile.in 2005-03-04 19:44:38.000000000 -0500
++++ kdebase-3.4.0/kioslave/system/mimetypes/Makefile.in 2005-03-18 14:34:27.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -36311,13 +38745,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -768,7 +771,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kioslave/tar/Makefile.in kdebase-3.4.0/kioslave/tar/Makefile.in
--- kdebase-3.4.0.orig/kioslave/tar/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/tar/Makefile.in 2005-03-04 19:44:38.000000000 -0500
++++ kdebase-3.4.0/kioslave/tar/Makefile.in 2005-03-18 14:34:27.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -36382,11 +38826,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kioslave/thumbnail/Makefile.in kdebase-3.4.0/kioslave/thumbnail/Makefile.in
--- kdebase-3.4.0.orig/kioslave/thumbnail/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/thumbnail/Makefile.in 2005-03-04 19:44:39.000000000 -0500
++++ kdebase-3.4.0/kioslave/thumbnail/Makefile.in 2005-03-18 14:34:27.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -36451,11 +38896,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kioslave/trash/Makefile.in kdebase-3.4.0/kioslave/trash/Makefile.in
--- kdebase-3.4.0.orig/kioslave/trash/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/trash/Makefile.in 2005-03-04 19:44:39.000000000 -0500
++++ kdebase-3.4.0/kioslave/trash/Makefile.in 2005-03-18 14:34:27.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -36568,11 +39014,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/kioslave/trash/kfile-plugin/Makefile.in kdebase-3.4.0/kioslave/trash/kfile-plugin/Makefile.in
--- kdebase-3.4.0.orig/kioslave/trash/kfile-plugin/Makefile.in 2005-03-04 08:15:02.000000000 -0500
-+++ kdebase-3.4.0/kioslave/trash/kfile-plugin/Makefile.in 2005-03-04 19:44:39.000000000 -0500
++++ kdebase-3.4.0/kioslave/trash/kfile-plugin/Makefile.in 2005-03-18 14:34:27.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -36637,11 +39084,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/klipper/Makefile.in kdebase-3.4.0/klipper/Makefile.in
--- kdebase-3.4.0.orig/klipper/Makefile.in 2005-03-04 08:15:02.000000000 -0500
-+++ kdebase-3.4.0/klipper/Makefile.in 2005-03-04 19:44:39.000000000 -0500
++++ kdebase-3.4.0/klipper/Makefile.in 2005-03-18 14:34:28.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -36814,11 +39262,12 @@
popupproxy.lo: popupproxy.moc
diff -Nrua kdebase-3.4.0.orig/kmenuedit/Makefile.in kdebase-3.4.0/kmenuedit/Makefile.in
--- kdebase-3.4.0.orig/kmenuedit/Makefile.in 2005-03-04 08:15:02.000000000 -0500
-+++ kdebase-3.4.0/kmenuedit/Makefile.in 2005-03-04 19:44:39.000000000 -0500
++++ kdebase-3.4.0/kmenuedit/Makefile.in 2005-03-18 14:34:29.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -36998,11 +39447,12 @@
echo "#define KDE_USE_FINAL 1" >> libkmenueditcommon_la.all_cpp.final; \
diff -Nrua kdebase-3.4.0.orig/kmenuedit/pixmaps/Makefile.in kdebase-3.4.0/kmenuedit/pixmaps/Makefile.in
--- kdebase-3.4.0.orig/kmenuedit/pixmaps/Makefile.in 2005-03-04 08:15:02.000000000 -0500
-+++ kdebase-3.4.0/kmenuedit/pixmaps/Makefile.in 2005-03-04 19:44:39.000000000 -0500
++++ kdebase-3.4.0/kmenuedit/pixmaps/Makefile.in 2005-03-18 14:34:29.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -37093,13 +39543,23 @@
#>+ 15
force-reedit:
+@@ -773,7 +776,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/knetattach/Makefile.in kdebase-3.4.0/knetattach/Makefile.in
--- kdebase-3.4.0.orig/knetattach/Makefile.in 2005-03-04 08:15:02.000000000 -0500
-+++ kdebase-3.4.0/knetattach/Makefile.in 2005-03-04 19:44:39.000000000 -0500
++++ kdebase-3.4.0/knetattach/Makefile.in 2005-03-18 14:34:29.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -37206,11 +39666,12 @@
force-reedit:
diff -Nrua kdebase-3.4.0.orig/konqueror/Makefile.in kdebase-3.4.0/konqueror/Makefile.in
--- kdebase-3.4.0.orig/konqueror/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/Makefile.in 2005-03-04 19:44:41.000000000 -0500
++++ kdebase-3.4.0/konqueror/Makefile.in 2005-03-18 14:34:30.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -37370,11 +39831,12 @@
echo "#define KDE_USE_FINAL 1" >> libkdeinit_konqueror_la.all_cc.final; \
diff -Nrua kdebase-3.4.0.orig/konqueror/about/Makefile.in kdebase-3.4.0/konqueror/about/Makefile.in
--- kdebase-3.4.0.orig/konqueror/about/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/about/Makefile.in 2005-03-04 19:44:41.000000000 -0500
++++ kdebase-3.4.0/konqueror/about/Makefile.in 2005-03-18 14:34:30.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -37439,11 +39901,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/konqueror/client/Makefile.in kdebase-3.4.0/konqueror/client/Makefile.in
--- kdebase-3.4.0.orig/konqueror/client/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/client/Makefile.in 2005-03-04 19:44:41.000000000 -0500
++++ kdebase-3.4.0/konqueror/client/Makefile.in 2005-03-18 14:34:30.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -37508,11 +39971,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/konqueror/iconview/Makefile.in kdebase-3.4.0/konqueror/iconview/Makefile.in
--- kdebase-3.4.0.orig/konqueror/iconview/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/iconview/Makefile.in 2005-03-04 19:44:41.000000000 -0500
++++ kdebase-3.4.0/konqueror/iconview/Makefile.in 2005-03-18 14:34:31.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -37577,11 +40041,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/konqueror/keditbookmarks/Makefile.in kdebase-3.4.0/konqueror/keditbookmarks/Makefile.in
--- kdebase-3.4.0.orig/konqueror/keditbookmarks/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/keditbookmarks/Makefile.in 2005-03-04 19:44:41.000000000 -0500
++++ kdebase-3.4.0/konqueror/keditbookmarks/Makefile.in 2005-03-18 14:34:31.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -37742,11 +40207,12 @@
echo "#define KDE_USE_FINAL 1" >> libkdeinit_keditbookmarks_la.all_cpp.final; \
diff -Nrua kdebase-3.4.0.orig/konqueror/kttsplugin/Makefile.in kdebase-3.4.0/konqueror/kttsplugin/Makefile.in
--- kdebase-3.4.0.orig/konqueror/kttsplugin/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/kttsplugin/Makefile.in 2005-03-04 19:44:41.000000000 -0500
++++ kdebase-3.4.0/konqueror/kttsplugin/Makefile.in 2005-03-18 14:34:31.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -37811,11 +40277,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/konqueror/listview/Makefile.in kdebase-3.4.0/konqueror/listview/Makefile.in
--- kdebase-3.4.0.orig/konqueror/listview/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/listview/Makefile.in 2005-03-04 19:44:41.000000000 -0500
++++ kdebase-3.4.0/konqueror/listview/Makefile.in 2005-03-18 14:34:31.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -37889,11 +40356,12 @@
clean-closures:
diff -Nrua kdebase-3.4.0.orig/konqueror/pics/Makefile.in kdebase-3.4.0/konqueror/pics/Makefile.in
--- kdebase-3.4.0.orig/konqueror/pics/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/pics/Makefile.in 2005-03-04 19:44:41.000000000 -0500
++++ kdebase-3.4.0/konqueror/pics/Makefile.in 2005-03-18 14:34:31.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38041,13 +40509,23 @@
#>+ 15
force-reedit:
+@@ -928,7 +943,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/konqueror/pics/actions/Makefile.in kdebase-3.4.0/konqueror/pics/actions/Makefile.in
--- kdebase-3.4.0.orig/konqueror/pics/actions/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/pics/actions/Makefile.in 2005-03-04 19:44:41.000000000 -0500
++++ kdebase-3.4.0/konqueror/pics/actions/Makefile.in 2005-03-18 14:34:31.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38087,13 +40565,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -758,7 +761,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/konqueror/pics/indicators/Makefile.in kdebase-3.4.0/konqueror/pics/indicators/Makefile.in
--- kdebase-3.4.0.orig/konqueror/pics/indicators/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/pics/indicators/Makefile.in 2005-03-04 19:44:41.000000000 -0500
++++ kdebase-3.4.0/konqueror/pics/indicators/Makefile.in 2005-03-18 14:34:31.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38133,13 +40621,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -768,7 +771,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/konqueror/pics/tiles/Makefile.in kdebase-3.4.0/konqueror/pics/tiles/Makefile.in
--- kdebase-3.4.0.orig/konqueror/pics/tiles/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/pics/tiles/Makefile.in 2005-03-04 19:44:41.000000000 -0500
++++ kdebase-3.4.0/konqueror/pics/tiles/Makefile.in 2005-03-18 14:34:31.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38179,13 +40677,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -768,7 +771,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/konqueror/preloader/Makefile.in kdebase-3.4.0/konqueror/preloader/Makefile.in
--- kdebase-3.4.0.orig/konqueror/preloader/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/preloader/Makefile.in 2005-03-04 19:44:41.000000000 -0500
++++ kdebase-3.4.0/konqueror/preloader/Makefile.in 2005-03-18 14:34:31.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38250,11 +40758,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/konqueror/quickprint/Makefile.in kdebase-3.4.0/konqueror/quickprint/Makefile.in
--- kdebase-3.4.0.orig/konqueror/quickprint/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/quickprint/Makefile.in 2005-03-04 19:44:41.000000000 -0500
++++ kdebase-3.4.0/konqueror/quickprint/Makefile.in 2005-03-18 14:34:31.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38303,13 +40812,23 @@
#>+ 2
docs-am:
+@@ -773,7 +776,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/konqueror/remoteencodingplugin/Makefile.in kdebase-3.4.0/konqueror/remoteencodingplugin/Makefile.in
--- kdebase-3.4.0.orig/konqueror/remoteencodingplugin/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/remoteencodingplugin/Makefile.in 2005-03-04 19:44:41.000000000 -0500
++++ kdebase-3.4.0/konqueror/remoteencodingplugin/Makefile.in 2005-03-18 14:34:31.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38374,11 +40893,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/konqueror/shellcmdplugin/Makefile.in kdebase-3.4.0/konqueror/shellcmdplugin/Makefile.in
--- kdebase-3.4.0.orig/konqueror/shellcmdplugin/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/shellcmdplugin/Makefile.in 2005-03-04 19:44:42.000000000 -0500
++++ kdebase-3.4.0/konqueror/shellcmdplugin/Makefile.in 2005-03-18 14:34:31.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38443,11 +40963,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/Makefile.in kdebase-3.4.0/konqueror/sidebar/Makefile.in
--- kdebase-3.4.0.orig/konqueror/sidebar/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/Makefile.in 2005-03-04 19:44:42.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/Makefile.in 2005-03-18 14:34:31.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38560,11 +41081,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/test/Makefile.in kdebase-3.4.0/konqueror/sidebar/test/Makefile.in
--- kdebase-3.4.0.orig/konqueror/sidebar/test/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/test/Makefile.in 2005-03-04 19:44:42.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/test/Makefile.in 2005-03-18 14:34:31.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38677,11 +41199,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/trees/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/Makefile.in
--- kdebase-3.4.0.orig/konqueror/sidebar/trees/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/trees/Makefile.in 2005-03-04 19:44:42.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/trees/Makefile.in 2005-03-18 14:34:31.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38794,11 +41317,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/trees/bookmark_module/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/bookmark_module/Makefile.in
--- kdebase-3.4.0.orig/konqueror/sidebar/trees/bookmark_module/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/trees/bookmark_module/Makefile.in 2005-03-04 19:44:42.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/trees/bookmark_module/Makefile.in 2005-03-18 14:34:31.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38863,11 +41387,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/trees/dirtree_module/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/dirtree_module/Makefile.in
--- kdebase-3.4.0.orig/konqueror/sidebar/trees/dirtree_module/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/trees/dirtree_module/Makefile.in 2005-03-04 19:44:42.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/trees/dirtree_module/Makefile.in 2005-03-18 14:34:32.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38932,11 +41457,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/trees/history_module/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/history_module/Makefile.in
--- kdebase-3.4.0.orig/konqueror/sidebar/trees/history_module/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/trees/history_module/Makefile.in 2005-03-04 19:44:42.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/trees/history_module/Makefile.in 2005-03-18 14:34:32.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -39001,11 +41527,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/trees/init/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/init/Makefile.in
--- kdebase-3.4.0.orig/konqueror/sidebar/trees/init/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/trees/init/Makefile.in 2005-03-04 19:44:42.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/trees/init/Makefile.in 2005-03-18 14:34:32.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -39093,13 +41620,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -994,7 +1009,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/trees/init/remote/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/init/remote/Makefile.in
--- kdebase-3.4.0.orig/konqueror/sidebar/trees/init/remote/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/trees/init/remote/Makefile.in 2005-03-04 19:44:42.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/trees/init/remote/Makefile.in 2005-03-18 14:34:32.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -39187,13 +41724,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -922,7 +937,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/trees/init/remote/ftp/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/init/remote/ftp/Makefile.in
--- kdebase-3.4.0.orig/konqueror/sidebar/trees/init/remote/ftp/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/trees/init/remote/ftp/Makefile.in 2005-03-04 19:44:42.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/trees/init/remote/ftp/Makefile.in 2005-03-18 14:34:32.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -39233,13 +41780,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -770,7 +773,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/trees/init/remote/web/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/init/remote/web/Makefile.in
--- kdebase-3.4.0.orig/konqueror/sidebar/trees/init/remote/web/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/trees/init/remote/web/Makefile.in 2005-03-04 19:44:42.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/trees/init/remote/web/Makefile.in 2005-03-18 14:34:32.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -39279,13 +41836,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -770,7 +773,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/trees/init/services/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/init/services/Makefile.in
--- kdebase-3.4.0.orig/konqueror/sidebar/trees/init/services/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/trees/init/services/Makefile.in 2005-03-04 19:44:42.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/trees/init/services/Makefile.in 2005-03-18 14:34:32.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -39325,13 +41892,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -769,7 +772,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/web_module/Makefile.in kdebase-3.4.0/konqueror/sidebar/web_module/Makefile.in
--- kdebase-3.4.0.orig/konqueror/sidebar/web_module/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/web_module/Makefile.in 2005-03-04 19:44:42.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/web_module/Makefile.in 2005-03-18 14:34:33.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -39396,11 +41973,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/konsole/Makefile.in kdebase-3.4.0/konsole/Makefile.in
--- kdebase-3.4.0.orig/konsole/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konsole/Makefile.in 2005-03-04 19:44:42.000000000 -0500
++++ kdebase-3.4.0/konsole/Makefile.in 2005-03-18 14:34:33.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -39488,13 +42066,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1087,7 +1102,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/konsole/doc/Makefile.in kdebase-3.4.0/konsole/doc/Makefile.in
--- kdebase-3.4.0.orig/konsole/doc/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konsole/doc/Makefile.in 2005-03-04 19:44:42.000000000 -0500
++++ kdebase-3.4.0/konsole/doc/Makefile.in 2005-03-18 14:34:33.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -39582,13 +42170,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -888,7 +903,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/konsole/doc/VT100/Makefile.in kdebase-3.4.0/konsole/doc/VT100/Makefile.in
--- kdebase-3.4.0.orig/konsole/doc/VT100/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konsole/doc/VT100/Makefile.in 2005-03-04 19:44:42.000000000 -0500
++++ kdebase-3.4.0/konsole/doc/VT100/Makefile.in 2005-03-18 14:34:33.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -39628,13 +42226,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -738,7 +741,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/konsole/fonts/Makefile.in kdebase-3.4.0/konsole/fonts/Makefile.in
--- kdebase-3.4.0.orig/konsole/fonts/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konsole/fonts/Makefile.in 2005-03-04 19:44:42.000000000 -0500
++++ kdebase-3.4.0/konsole/fonts/Makefile.in 2005-03-18 14:34:33.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -39674,13 +42282,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -779,7 +782,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/konsole/konsole/Makefile.in kdebase-3.4.0/konsole/konsole/Makefile.in
--- kdebase-3.4.0.orig/konsole/konsole/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/konsole/konsole/Makefile.in 2005-03-04 19:44:44.000000000 -0500
++++ kdebase-3.4.0/konsole/konsole/Makefile.in 2005-03-18 14:34:34.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -39832,11 +42450,12 @@
nmcheck-am: nmcheck
diff -Nrua kdebase-3.4.0.orig/konsole/other/Makefile.in kdebase-3.4.0/konsole/other/Makefile.in
--- kdebase-3.4.0.orig/konsole/other/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/konsole/other/Makefile.in 2005-03-04 19:44:44.000000000 -0500
++++ kdebase-3.4.0/konsole/other/Makefile.in 2005-03-18 14:34:34.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -39966,13 +42585,23 @@
#>+ 15
force-reedit:
+@@ -986,7 +1001,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/konsole/other/icons/Makefile.in kdebase-3.4.0/konsole/other/icons/Makefile.in
--- kdebase-3.4.0.orig/konsole/other/icons/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/konsole/other/icons/Makefile.in 2005-03-04 19:44:44.000000000 -0500
++++ kdebase-3.4.0/konsole/other/icons/Makefile.in 2005-03-18 14:34:34.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -40053,13 +42682,23 @@
#>+ 15
force-reedit:
+@@ -760,7 +763,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kpager/Makefile.in kdebase-3.4.0/kpager/Makefile.in
--- kdebase-3.4.0.orig/kpager/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/kpager/Makefile.in 2005-03-04 19:44:44.000000000 -0500
++++ kdebase-3.4.0/kpager/Makefile.in 2005-03-18 14:34:34.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -40144,11 +42783,12 @@
#>+ 15
diff -Nrua kdebase-3.4.0.orig/kpersonalizer/Makefile.in kdebase-3.4.0/kpersonalizer/Makefile.in
--- kdebase-3.4.0.orig/kpersonalizer/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/kpersonalizer/Makefile.in 2005-03-04 19:44:44.000000000 -0500
++++ kdebase-3.4.0/kpersonalizer/Makefile.in 2005-03-18 14:34:34.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -40261,11 +42901,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/kpersonalizer/pics/Makefile.in kdebase-3.4.0/kpersonalizer/pics/Makefile.in
--- kdebase-3.4.0.orig/kpersonalizer/pics/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/kpersonalizer/pics/Makefile.in 2005-03-04 19:44:44.000000000 -0500
++++ kdebase-3.4.0/kpersonalizer/pics/Makefile.in 2005-03-18 14:34:34.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -40305,13 +42946,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -767,7 +770,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kreadconfig/Makefile.in kdebase-3.4.0/kreadconfig/Makefile.in
--- kdebase-3.4.0.orig/kreadconfig/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/kreadconfig/Makefile.in 2005-03-04 19:44:44.000000000 -0500
++++ kdebase-3.4.0/kreadconfig/Makefile.in 2005-03-18 14:34:35.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -40376,11 +43027,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kscreensaver/Makefile.in kdebase-3.4.0/kscreensaver/Makefile.in
--- kdebase-3.4.0.orig/kscreensaver/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/kscreensaver/Makefile.in 2005-03-04 19:44:44.000000000 -0500
++++ kdebase-3.4.0/kscreensaver/Makefile.in 2005-03-18 14:34:35.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -40445,11 +43097,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/ksmserver/Makefile.in kdebase-3.4.0/ksmserver/Makefile.in
--- kdebase-3.4.0.orig/ksmserver/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksmserver/Makefile.in 2005-03-04 19:44:45.000000000 -0500
++++ kdebase-3.4.0/ksmserver/Makefile.in 2005-03-18 14:34:35.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -40562,11 +43215,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/ksplashml/Makefile.in kdebase-3.4.0/ksplashml/Makefile.in
--- kdebase-3.4.0.orig/ksplashml/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/Makefile.in 2005-03-04 19:44:45.000000000 -0500
++++ kdebase-3.4.0/ksplashml/Makefile.in 2005-03-18 14:34:35.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -40679,11 +43333,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/ksplashml/kcmksplash/Makefile.in kdebase-3.4.0/ksplashml/kcmksplash/Makefile.in
--- kdebase-3.4.0.orig/ksplashml/kcmksplash/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/kcmksplash/Makefile.in 2005-03-04 19:44:45.000000000 -0500
++++ kdebase-3.4.0/ksplashml/kcmksplash/Makefile.in 2005-03-18 14:34:35.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -40796,11 +43451,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/ksplashml/kcmksplash/pics/Makefile.in kdebase-3.4.0/ksplashml/kcmksplash/pics/Makefile.in
--- kdebase-3.4.0.orig/ksplashml/kcmksplash/pics/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/kcmksplash/pics/Makefile.in 2005-03-04 19:44:45.000000000 -0500
++++ kdebase-3.4.0/ksplashml/kcmksplash/pics/Makefile.in 2005-03-18 14:34:35.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -40875,13 +43531,23 @@
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ksplash.png
#>+ 15
+@@ -762,7 +765,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/ksplashml/pics/Makefile.in kdebase-3.4.0/ksplashml/pics/Makefile.in
--- kdebase-3.4.0.orig/ksplashml/pics/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/pics/Makefile.in 2005-03-04 19:44:45.000000000 -0500
++++ kdebase-3.4.0/ksplashml/pics/Makefile.in 2005-03-18 14:34:35.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -40969,13 +43635,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -921,7 +936,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/ksplashml/pics/themes/Makefile.in kdebase-3.4.0/ksplashml/pics/themes/Makefile.in
--- kdebase-3.4.0.orig/ksplashml/pics/themes/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/pics/themes/Makefile.in 2005-03-04 19:44:45.000000000 -0500
++++ kdebase-3.4.0/ksplashml/pics/themes/Makefile.in 2005-03-18 14:34:35.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -41070,13 +43746,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -889,7 +904,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/ksplashml/pics/themes/blue-bend/Makefile.in kdebase-3.4.0/ksplashml/pics/themes/blue-bend/Makefile.in
--- kdebase-3.4.0.orig/ksplashml/pics/themes/blue-bend/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/pics/themes/blue-bend/Makefile.in 2005-03-04 19:44:45.000000000 -0500
++++ kdebase-3.4.0/ksplashml/pics/themes/blue-bend/Makefile.in 2005-03-18 14:34:35.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -41116,13 +43802,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -770,7 +773,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/ksplashml/pics/themes/default/Makefile.in kdebase-3.4.0/ksplashml/pics/themes/default/Makefile.in
--- kdebase-3.4.0.orig/ksplashml/pics/themes/default/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/pics/themes/default/Makefile.in 2005-03-04 19:44:45.000000000 -0500
++++ kdebase-3.4.0/ksplashml/pics/themes/default/Makefile.in 2005-03-18 14:34:35.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -41210,13 +43906,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -923,7 +938,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/ksplashml/pics/themes/default/locolor/Makefile.in kdebase-3.4.0/ksplashml/pics/themes/default/locolor/Makefile.in
--- kdebase-3.4.0.orig/ksplashml/pics/themes/default/locolor/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/pics/themes/default/locolor/Makefile.in 2005-03-04 19:44:45.000000000 -0500
++++ kdebase-3.4.0/ksplashml/pics/themes/default/locolor/Makefile.in 2005-03-18 14:34:35.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -41256,13 +43962,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -770,7 +773,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/ksplashml/pics/themes/none/Makefile.in kdebase-3.4.0/ksplashml/pics/themes/none/Makefile.in
--- kdebase-3.4.0.orig/ksplashml/pics/themes/none/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/pics/themes/none/Makefile.in 2005-03-04 19:44:45.000000000 -0500
++++ kdebase-3.4.0/ksplashml/pics/themes/none/Makefile.in 2005-03-18 14:34:35.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -41302,13 +44018,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -770,7 +773,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/ksplashml/pics/themes/simple/Makefile.in kdebase-3.4.0/ksplashml/pics/themes/simple/Makefile.in
--- kdebase-3.4.0.orig/ksplashml/pics/themes/simple/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/pics/themes/simple/Makefile.in 2005-03-04 19:44:45.000000000 -0500
++++ kdebase-3.4.0/ksplashml/pics/themes/simple/Makefile.in 2005-03-18 14:34:35.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -41348,13 +44074,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -770,7 +773,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/ksplashml/themeengine/Makefile.in kdebase-3.4.0/ksplashml/themeengine/Makefile.in
--- kdebase-3.4.0.orig/ksplashml/themeengine/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/themeengine/Makefile.in 2005-03-04 19:44:45.000000000 -0500
++++ kdebase-3.4.0/ksplashml/themeengine/Makefile.in 2005-03-18 14:34:35.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -41467,11 +44203,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/ksplashml/themeengine/default/Makefile.in kdebase-3.4.0/ksplashml/themeengine/default/Makefile.in
--- kdebase-3.4.0.orig/ksplashml/themeengine/default/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/themeengine/default/Makefile.in 2005-03-04 19:44:45.000000000 -0500
++++ kdebase-3.4.0/ksplashml/themeengine/default/Makefile.in 2005-03-18 14:34:35.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -41536,11 +44273,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/ksplashml/themeengine/redmond/Makefile.in kdebase-3.4.0/ksplashml/themeengine/redmond/Makefile.in
--- kdebase-3.4.0.orig/ksplashml/themeengine/redmond/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/themeengine/redmond/Makefile.in 2005-03-04 19:44:45.000000000 -0500
++++ kdebase-3.4.0/ksplashml/themeengine/redmond/Makefile.in 2005-03-18 14:34:35.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -41653,11 +44391,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/ksplashml/themeengine/redmond/pics/Makefile.in kdebase-3.4.0/ksplashml/themeengine/redmond/pics/Makefile.in
--- kdebase-3.4.0.orig/ksplashml/themeengine/redmond/pics/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/themeengine/redmond/pics/Makefile.in 2005-03-04 19:44:45.000000000 -0500
++++ kdebase-3.4.0/ksplashml/themeengine/redmond/pics/Makefile.in 2005-03-18 14:34:35.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -41697,13 +44436,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -767,7 +770,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/ksplashml/themeengine/simple/Makefile.in kdebase-3.4.0/ksplashml/themeengine/simple/Makefile.in
--- kdebase-3.4.0.orig/ksplashml/themeengine/simple/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/themeengine/simple/Makefile.in 2005-03-04 19:44:45.000000000 -0500
++++ kdebase-3.4.0/ksplashml/themeengine/simple/Makefile.in 2005-03-18 14:34:35.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -41768,11 +44517,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/ksplashml/themeengine/standard/Makefile.in kdebase-3.4.0/ksplashml/themeengine/standard/Makefile.in
--- kdebase-3.4.0.orig/ksplashml/themeengine/standard/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/themeengine/standard/Makefile.in 2005-03-04 19:44:45.000000000 -0500
++++ kdebase-3.4.0/ksplashml/themeengine/standard/Makefile.in 2005-03-18 14:34:35.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -41885,11 +44635,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/ksplashml/themeengine/standard/pics/Makefile.in kdebase-3.4.0/ksplashml/themeengine/standard/pics/Makefile.in
--- kdebase-3.4.0.orig/ksplashml/themeengine/standard/pics/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/themeengine/standard/pics/Makefile.in 2005-03-04 19:44:45.000000000 -0500
++++ kdebase-3.4.0/ksplashml/themeengine/standard/pics/Makefile.in 2005-03-18 14:34:35.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -41929,13 +44680,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -767,7 +770,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kstart/Makefile.in kdebase-3.4.0/kstart/Makefile.in
--- kdebase-3.4.0.orig/kstart/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/kstart/Makefile.in 2005-03-04 19:44:45.000000000 -0500
++++ kdebase-3.4.0/kstart/Makefile.in 2005-03-18 14:34:35.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -42000,11 +44761,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/ksysguard/CContLib/Makefile.in kdebase-3.4.0/ksysguard/CContLib/Makefile.in
--- kdebase-3.4.0.orig/ksysguard/CContLib/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/CContLib/Makefile.in 2005-03-04 19:44:45.000000000 -0500
++++ kdebase-3.4.0/ksysguard/CContLib/Makefile.in 2005-03-18 14:34:35.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -42058,13 +44820,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLIBRARIES:
+@@ -852,7 +855,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/ksysguard/Makefile.in kdebase-3.4.0/ksysguard/Makefile.in
--- kdebase-3.4.0.orig/ksysguard/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/Makefile.in 2005-03-04 19:44:45.000000000 -0500
++++ kdebase-3.4.0/ksysguard/Makefile.in 2005-03-18 14:34:35.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -42174,13 +44946,23 @@
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ksysguard.png
#>+ 15
+@@ -915,7 +930,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/ksysguard/example/Makefile.in kdebase-3.4.0/ksysguard/example/Makefile.in
--- kdebase-3.4.0.orig/ksysguard/example/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/example/Makefile.in 2005-03-04 19:44:46.000000000 -0500
++++ kdebase-3.4.0/ksysguard/example/Makefile.in 2005-03-18 14:34:35.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -42220,13 +45002,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -790,7 +793,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/ksysguard/gui/Makefile.in kdebase-3.4.0/ksysguard/gui/Makefile.in
--- kdebase-3.4.0.orig/ksysguard/gui/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/gui/Makefile.in 2005-03-04 19:44:46.000000000 -0500
++++ kdebase-3.4.0/ksysguard/gui/Makefile.in 2005-03-18 14:34:36.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -42352,11 +45144,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/ksysguard/gui/SensorDisplayLib/Makefile.in kdebase-3.4.0/ksysguard/gui/SensorDisplayLib/Makefile.in
--- kdebase-3.4.0.orig/ksysguard/gui/SensorDisplayLib/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/gui/SensorDisplayLib/Makefile.in 2005-03-04 19:44:46.000000000 -0500
++++ kdebase-3.4.0/ksysguard/gui/SensorDisplayLib/Makefile.in 2005-03-18 14:34:36.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -42489,11 +45282,12 @@
echo "#define KDE_USE_FINAL 1" >> libsensordisplays_la.all_cc.final; \
diff -Nrua kdebase-3.4.0.orig/ksysguard/gui/ksgrd/Makefile.in kdebase-3.4.0/ksysguard/gui/ksgrd/Makefile.in
--- kdebase-3.4.0.orig/ksysguard/gui/ksgrd/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/gui/ksgrd/Makefile.in 2005-03-04 19:44:46.000000000 -0500
++++ kdebase-3.4.0/ksysguard/gui/ksgrd/Makefile.in 2005-03-18 14:34:36.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -42619,11 +45413,12 @@
echo "#define KDE_USE_FINAL 1" >> libksgrd_la.all_cc.final; \
diff -Nrua kdebase-3.4.0.orig/ksysguard/ksysguardd/FreeBSD/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/FreeBSD/Makefile.in
--- kdebase-3.4.0.orig/ksysguard/ksysguardd/FreeBSD/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/ksysguardd/FreeBSD/Makefile.in 2005-03-04 19:44:46.000000000 -0500
++++ kdebase-3.4.0/ksysguard/ksysguardd/FreeBSD/Makefile.in 2005-03-18 14:34:36.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -42677,13 +45472,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLIBRARIES:
+@@ -867,7 +870,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/ksysguard/ksysguardd/Irix/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/Irix/Makefile.in
--- kdebase-3.4.0.orig/ksysguard/ksysguardd/Irix/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/ksysguardd/Irix/Makefile.in 2005-03-04 19:44:46.000000000 -0500
++++ kdebase-3.4.0/ksysguard/ksysguardd/Irix/Makefile.in 2005-03-18 14:34:36.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -42737,13 +45542,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLIBRARIES:
+@@ -857,7 +860,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/ksysguard/ksysguardd/Linux/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/Linux/Makefile.in
--- kdebase-3.4.0.orig/ksysguard/ksysguardd/Linux/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/ksysguardd/Linux/Makefile.in 2005-03-04 19:44:46.000000000 -0500
++++ kdebase-3.4.0/ksysguard/ksysguardd/Linux/Makefile.in 2005-03-18 14:34:36.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -42797,13 +45612,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLIBRARIES:
+@@ -878,7 +881,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/ksysguard/ksysguardd/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/Makefile.in
--- kdebase-3.4.0.orig/ksysguard/ksysguardd/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/ksysguardd/Makefile.in 2005-03-04 19:44:46.000000000 -0500
++++ kdebase-3.4.0/ksysguard/ksysguardd/Makefile.in 2005-03-18 14:34:36.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -42905,13 +45730,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1005,7 +1020,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/ksysguard/ksysguardd/NetBSD/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/NetBSD/Makefile.in
--- kdebase-3.4.0.orig/ksysguard/ksysguardd/NetBSD/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/ksysguardd/NetBSD/Makefile.in 2005-03-04 19:44:46.000000000 -0500
++++ kdebase-3.4.0/ksysguard/ksysguardd/NetBSD/Makefile.in 2005-03-18 14:34:36.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -42965,13 +45800,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLIBRARIES:
+@@ -867,7 +870,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/ksysguard/ksysguardd/OpenBSD/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/OpenBSD/Makefile.in
--- kdebase-3.4.0.orig/ksysguard/ksysguardd/OpenBSD/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/ksysguardd/OpenBSD/Makefile.in 2005-03-04 19:44:46.000000000 -0500
++++ kdebase-3.4.0/ksysguard/ksysguardd/OpenBSD/Makefile.in 2005-03-18 14:34:36.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -43025,13 +45870,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLIBRARIES:
+@@ -853,7 +856,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/ksysguard/ksysguardd/Solaris/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/Solaris/Makefile.in
--- kdebase-3.4.0.orig/ksysguard/ksysguardd/Solaris/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/ksysguardd/Solaris/Makefile.in 2005-03-04 19:44:46.000000000 -0500
++++ kdebase-3.4.0/ksysguard/ksysguardd/Solaris/Makefile.in 2005-03-18 14:34:36.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -43085,13 +45940,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLIBRARIES:
+@@ -862,7 +865,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/ksysguard/ksysguardd/Tru64/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/Tru64/Makefile.in
--- kdebase-3.4.0.orig/ksysguard/ksysguardd/Tru64/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/ksysguardd/Tru64/Makefile.in 2005-03-04 19:44:46.000000000 -0500
++++ kdebase-3.4.0/ksysguard/ksysguardd/Tru64/Makefile.in 2005-03-18 14:34:36.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -43145,13 +46010,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLIBRARIES: $(lib_LIBRARIES)
@$(NORMAL_INSTALL)
+@@ -897,7 +900,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/ksysguard/pics/Makefile.in kdebase-3.4.0/ksysguard/pics/Makefile.in
--- kdebase-3.4.0.orig/ksysguard/pics/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/pics/Makefile.in 2005-03-04 19:44:46.000000000 -0500
++++ kdebase-3.4.0/ksysguard/pics/Makefile.in 2005-03-18 14:34:36.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -43191,13 +46066,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -771,7 +774,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/ksystraycmd/Makefile.in kdebase-3.4.0/ksystraycmd/Makefile.in
--- kdebase-3.4.0.orig/ksystraycmd/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksystraycmd/Makefile.in 2005-03-04 19:44:46.000000000 -0500
++++ kdebase-3.4.0/ksystraycmd/Makefile.in 2005-03-18 14:34:36.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -43262,11 +46147,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/ktip/Makefile.in kdebase-3.4.0/ktip/Makefile.in
--- kdebase-3.4.0.orig/ktip/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ktip/Makefile.in 2005-03-04 19:44:46.000000000 -0500
++++ kdebase-3.4.0/ktip/Makefile.in 2005-03-18 14:34:36.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -43413,11 +46299,12 @@
force-reedit:
diff -Nrua kdebase-3.4.0.orig/ktip/pics/Makefile.in kdebase-3.4.0/ktip/pics/Makefile.in
--- kdebase-3.4.0.orig/ktip/pics/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ktip/pics/Makefile.in 2005-03-04 19:44:46.000000000 -0500
++++ kdebase-3.4.0/ktip/pics/Makefile.in 2005-03-18 14:34:36.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -43457,13 +46344,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -767,7 +770,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kwin/Makefile.in kdebase-3.4.0/kwin/Makefile.in
--- kdebase-3.4.0.orig/kwin/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/kwin/Makefile.in 2005-03-04 19:44:47.000000000 -0500
++++ kdebase-3.4.0/kwin/Makefile.in 2005-03-18 14:34:37.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -43644,11 +46541,12 @@
popupinfo.lo: popupinfo.moc
diff -Nrua kdebase-3.4.0.orig/kwin/clients/Makefile.in kdebase-3.4.0/kwin/clients/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/Makefile.in 2005-03-04 19:44:47.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/Makefile.in 2005-03-18 14:34:37.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -43736,13 +46634,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -894,7 +909,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kwin/clients/b2/Makefile.in kdebase-3.4.0/kwin/clients/b2/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/b2/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/b2/Makefile.in 2005-03-04 19:44:47.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/b2/Makefile.in 2005-03-18 14:34:37.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -43855,11 +46763,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/kwin/clients/b2/config/Makefile.in kdebase-3.4.0/kwin/clients/b2/config/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/b2/config/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/b2/config/Makefile.in 2005-03-04 19:44:47.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/b2/config/Makefile.in 2005-03-18 14:34:37.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -43924,11 +46833,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kwin/clients/default/Makefile.in kdebase-3.4.0/kwin/clients/default/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/default/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/default/Makefile.in 2005-03-04 19:44:47.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/default/Makefile.in 2005-03-18 14:34:37.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -44041,11 +46951,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/kwin/clients/default/config/Makefile.in kdebase-3.4.0/kwin/clients/default/config/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/default/config/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/default/config/Makefile.in 2005-03-04 19:44:48.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/default/config/Makefile.in 2005-03-18 14:34:37.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -44110,11 +47021,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kwin/clients/keramik/Makefile.in kdebase-3.4.0/kwin/clients/keramik/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/keramik/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/keramik/Makefile.in 2005-03-04 19:44:48.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/keramik/Makefile.in 2005-03-18 14:34:37.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -44227,11 +47139,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/kwin/clients/keramik/config/Makefile.in kdebase-3.4.0/kwin/clients/keramik/config/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/keramik/config/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/keramik/config/Makefile.in 2005-03-04 19:44:48.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/keramik/config/Makefile.in 2005-03-18 14:34:37.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -44296,11 +47209,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kwin/clients/kwmtheme/Makefile.in kdebase-3.4.0/kwin/clients/kwmtheme/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/kwmtheme/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/kwmtheme/Makefile.in 2005-03-04 19:44:48.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/kwmtheme/Makefile.in 2005-03-18 14:34:37.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -44413,11 +47327,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/kwin/clients/kwmtheme/cli_installer/Makefile.in kdebase-3.4.0/kwin/clients/kwmtheme/cli_installer/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/kwmtheme/cli_installer/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/kwmtheme/cli_installer/Makefile.in 2005-03-04 19:44:48.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/kwmtheme/cli_installer/Makefile.in 2005-03-18 14:34:37.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -44482,11 +47397,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kwin/clients/laptop/Makefile.in kdebase-3.4.0/kwin/clients/laptop/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/laptop/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/laptop/Makefile.in 2005-03-04 19:44:48.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/laptop/Makefile.in 2005-03-18 14:34:37.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -44551,11 +47467,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kwin/clients/modernsystem/Makefile.in kdebase-3.4.0/kwin/clients/modernsystem/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/modernsystem/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/modernsystem/Makefile.in 2005-03-04 19:44:48.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/modernsystem/Makefile.in 2005-03-18 14:34:38.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -44668,11 +47585,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/kwin/clients/modernsystem/config/Makefile.in kdebase-3.4.0/kwin/clients/modernsystem/config/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/modernsystem/config/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/modernsystem/config/Makefile.in 2005-03-04 19:44:48.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/modernsystem/config/Makefile.in 2005-03-18 14:34:38.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -44737,11 +47655,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kwin/clients/plastik/Makefile.in kdebase-3.4.0/kwin/clients/plastik/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/plastik/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/plastik/Makefile.in 2005-03-04 19:44:49.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/plastik/Makefile.in 2005-03-18 14:34:38.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -44854,11 +47773,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/kwin/clients/plastik/config/Makefile.in kdebase-3.4.0/kwin/clients/plastik/config/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/plastik/config/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/plastik/config/Makefile.in 2005-03-04 19:44:49.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/plastik/config/Makefile.in 2005-03-18 14:34:38.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -44923,11 +47843,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kwin/clients/quartz/Makefile.in kdebase-3.4.0/kwin/clients/quartz/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/quartz/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/quartz/Makefile.in 2005-03-04 19:44:49.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/quartz/Makefile.in 2005-03-18 14:34:38.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -45040,11 +47961,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/kwin/clients/quartz/config/Makefile.in kdebase-3.4.0/kwin/clients/quartz/config/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/quartz/config/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/quartz/config/Makefile.in 2005-03-04 19:44:49.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/quartz/config/Makefile.in 2005-03-18 14:34:38.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -45109,11 +48031,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kwin/clients/redmond/Makefile.in kdebase-3.4.0/kwin/clients/redmond/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/redmond/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/redmond/Makefile.in 2005-03-04 19:44:49.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/redmond/Makefile.in 2005-03-18 14:34:38.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -45178,11 +48101,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kwin/clients/test/Makefile.in kdebase-3.4.0/kwin/clients/test/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/test/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/test/Makefile.in 2005-03-04 19:44:50.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/test/Makefile.in 2005-03-18 14:34:38.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -45247,11 +48171,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kwin/clients/web/Makefile.in kdebase-3.4.0/kwin/clients/web/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/web/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/web/Makefile.in 2005-03-04 19:44:51.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/web/Makefile.in 2005-03-18 14:34:38.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -45394,11 +48319,12 @@
nmcheck:
diff -Nrua kdebase-3.4.0.orig/kwin/data/Makefile.in kdebase-3.4.0/kwin/data/Makefile.in
--- kdebase-3.4.0.orig/kwin/data/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/data/Makefile.in 2005-03-04 19:44:51.000000000 -0500
++++ kdebase-3.4.0/kwin/data/Makefile.in 2005-03-18 14:34:38.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -45463,11 +48389,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kwin/kcmkwin/Makefile.in kdebase-3.4.0/kwin/kcmkwin/Makefile.in
--- kdebase-3.4.0.orig/kwin/kcmkwin/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/kcmkwin/Makefile.in 2005-03-04 19:44:51.000000000 -0500
++++ kdebase-3.4.0/kwin/kcmkwin/Makefile.in 2005-03-18 14:34:38.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -45555,13 +48482,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -887,7 +902,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kwin/kcmkwin/kwindecoration/Makefile.in kdebase-3.4.0/kwin/kcmkwin/kwindecoration/Makefile.in
--- kdebase-3.4.0.orig/kwin/kcmkwin/kwindecoration/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/kcmkwin/kwindecoration/Makefile.in 2005-03-04 19:44:51.000000000 -0500
++++ kdebase-3.4.0/kwin/kcmkwin/kwindecoration/Makefile.in 2005-03-18 14:34:38.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -45626,11 +48563,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kwin/kcmkwin/kwinoptions/Makefile.in kdebase-3.4.0/kwin/kcmkwin/kwinoptions/Makefile.in
--- kdebase-3.4.0.orig/kwin/kcmkwin/kwinoptions/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/kcmkwin/kwinoptions/Makefile.in 2005-03-04 19:44:52.000000000 -0500
++++ kdebase-3.4.0/kwin/kcmkwin/kwinoptions/Makefile.in 2005-03-18 14:34:38.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -45695,11 +48633,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kwin/kcmkwin/kwinrules/Makefile.in kdebase-3.4.0/kwin/kcmkwin/kwinrules/Makefile.in
--- kdebase-3.4.0.orig/kwin/kcmkwin/kwinrules/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/kwin/kcmkwin/kwinrules/Makefile.in 2005-03-04 19:44:52.000000000 -0500
++++ kdebase-3.4.0/kwin/kcmkwin/kwinrules/Makefile.in 2005-03-18 14:34:38.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -45764,11 +48703,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kwin/killer/Makefile.in kdebase-3.4.0/kwin/killer/Makefile.in
--- kdebase-3.4.0.orig/kwin/killer/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/kwin/killer/Makefile.in 2005-03-04 19:44:52.000000000 -0500
++++ kdebase-3.4.0/kwin/killer/Makefile.in 2005-03-18 14:34:38.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -45833,11 +48773,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kwin/kompmgr/Makefile.in kdebase-3.4.0/kwin/kompmgr/Makefile.in
--- kdebase-3.4.0.orig/kwin/kompmgr/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/kwin/kompmgr/Makefile.in 2005-03-04 19:44:52.000000000 -0500
++++ kdebase-3.4.0/kwin/kompmgr/Makefile.in 2005-03-18 14:34:38.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -45891,13 +48832,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
+@@ -876,7 +879,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kwin/lib/Makefile.in kdebase-3.4.0/kwin/lib/Makefile.in
--- kdebase-3.4.0.orig/kwin/lib/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/kwin/lib/Makefile.in 2005-03-04 19:44:53.000000000 -0500
++++ kdebase-3.4.0/kwin/lib/Makefile.in 2005-03-18 14:34:39.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -45962,11 +48913,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/kwin/oldheaders/Makefile.in kdebase-3.4.0/kwin/oldheaders/Makefile.in
--- kdebase-3.4.0.orig/kwin/oldheaders/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/kwin/oldheaders/Makefile.in 2005-03-04 19:44:53.000000000 -0500
++++ kdebase-3.4.0/kwin/oldheaders/Makefile.in 2005-03-18 14:34:39.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -46006,13 +48958,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -814,7 +817,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kwin/pics/Makefile.in kdebase-3.4.0/kwin/pics/Makefile.in
--- kdebase-3.4.0.orig/kwin/pics/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/kwin/pics/Makefile.in 2005-03-04 19:44:53.000000000 -0500
++++ kdebase-3.4.0/kwin/pics/Makefile.in 2005-03-18 14:34:39.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -46052,13 +49014,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -771,7 +774,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/kwin/tools/Makefile.in kdebase-3.4.0/kwin/tools/Makefile.in
--- kdebase-3.4.0.orig/kwin/tools/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/kwin/tools/Makefile.in 2005-03-04 19:44:53.000000000 -0500
++++ kdebase-3.4.0/kwin/tools/Makefile.in 2005-03-18 14:34:39.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -46123,11 +49095,12 @@
clean-noinstPROGRAMS:
diff -Nrua kdebase-3.4.0.orig/kxkb/Makefile.in kdebase-3.4.0/kxkb/Makefile.in
--- kdebase-3.4.0.orig/kxkb/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/kxkb/Makefile.in 2005-03-04 19:44:53.000000000 -0500
++++ kdebase-3.4.0/kxkb/Makefile.in 2005-03-18 14:34:39.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -46267,11 +49240,12 @@
libkdeinit_kxkb_la_LDFLAGS = -no-undefined -avoid-version $(all_libraries)
diff -Nrua kdebase-3.4.0.orig/kxkb/pics/Makefile.in kdebase-3.4.0/kxkb/pics/Makefile.in
--- kdebase-3.4.0.orig/kxkb/pics/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/kxkb/pics/Makefile.in 2005-03-04 19:44:53.000000000 -0500
++++ kdebase-3.4.0/kxkb/pics/Makefile.in 2005-03-18 14:34:39.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -46332,13 +49306,23 @@
#>+ 15
force-reedit:
+@@ -753,7 +756,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/l10n/Makefile.in kdebase-3.4.0/l10n/Makefile.in
--- kdebase-3.4.0.orig/l10n/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/l10n/Makefile.in 2005-03-04 19:44:53.000000000 -0500
++++ kdebase-3.4.0/l10n/Makefile.in 2005-03-18 14:34:39.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -46378,13 +49362,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -788,7 +791,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/libkonq/Makefile.in kdebase-3.4.0/libkonq/Makefile.in
--- kdebase-3.4.0.orig/libkonq/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/libkonq/Makefile.in 2005-03-04 19:44:57.000000000 -0500
++++ kdebase-3.4.0/libkonq/Makefile.in 2005-03-18 14:34:41.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -46575,11 +49569,12 @@
konq_popupmenu.o: konq_popupmenu.moc
diff -Nrua kdebase-3.4.0.orig/libkonq/favicons/Makefile.in kdebase-3.4.0/libkonq/favicons/Makefile.in
--- kdebase-3.4.0.orig/libkonq/favicons/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/libkonq/favicons/Makefile.in 2005-03-04 19:44:57.000000000 -0500
++++ kdebase-3.4.0/libkonq/favicons/Makefile.in 2005-03-18 14:34:41.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -46644,11 +49639,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/libkonq/pics/Makefile.in kdebase-3.4.0/libkonq/pics/Makefile.in
--- kdebase-3.4.0.orig/libkonq/pics/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/libkonq/pics/Makefile.in 2005-03-04 19:44:57.000000000 -0500
++++ kdebase-3.4.0/libkonq/pics/Makefile.in 2005-03-18 14:34:41.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -46688,13 +49684,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -767,7 +770,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/nsplugins/Makefile.in kdebase-3.4.0/nsplugins/Makefile.in
--- kdebase-3.4.0.orig/nsplugins/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/nsplugins/Makefile.in 2005-03-04 19:44:57.000000000 -0500
++++ kdebase-3.4.0/nsplugins/Makefile.in 2005-03-18 14:34:41.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -46807,11 +49813,12 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdebase-3.4.0.orig/nsplugins/test/Makefile.in kdebase-3.4.0/nsplugins/test/Makefile.in
--- kdebase-3.4.0.orig/nsplugins/test/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/nsplugins/test/Makefile.in 2005-03-04 19:44:57.000000000 -0500
++++ kdebase-3.4.0/nsplugins/test/Makefile.in 2005-03-18 14:34:41.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -46876,11 +49883,12 @@
clean-checkPROGRAMS:
diff -Nrua kdebase-3.4.0.orig/nsplugins/viewer/Makefile.in kdebase-3.4.0/nsplugins/viewer/Makefile.in
--- kdebase-3.4.0.orig/nsplugins/viewer/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/nsplugins/viewer/Makefile.in 2005-03-04 19:44:57.000000000 -0500
++++ kdebase-3.4.0/nsplugins/viewer/Makefile.in 2005-03-18 14:34:41.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -46945,11 +49953,12 @@
@$(NORMAL_INSTALL)
diff -Nrua kdebase-3.4.0.orig/nsplugins/wrapper/Makefile.in kdebase-3.4.0/nsplugins/wrapper/Makefile.in
--- kdebase-3.4.0.orig/nsplugins/wrapper/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/nsplugins/wrapper/Makefile.in 2005-03-04 19:44:57.000000000 -0500
++++ kdebase-3.4.0/nsplugins/wrapper/Makefile.in 2005-03-18 14:34:41.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -47003,13 +50012,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -880,7 +883,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/pics/Makefile.in kdebase-3.4.0/pics/Makefile.in
--- kdebase-3.4.0.orig/pics/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/pics/Makefile.in 2005-03-04 19:44:57.000000000 -0500
++++ kdebase-3.4.0/pics/Makefile.in 2005-03-18 14:34:41.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -47097,13 +50116,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -887,7 +902,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/pics/crystalsvg/Makefile.in kdebase-3.4.0/pics/crystalsvg/Makefile.in
--- kdebase-3.4.0.orig/pics/crystalsvg/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/pics/crystalsvg/Makefile.in 2005-03-04 19:44:58.000000000 -0500
++++ kdebase-3.4.0/pics/crystalsvg/Makefile.in 2005-03-18 14:34:41.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -48639,13 +51668,23 @@
#>+ 15
force-reedit:
+@@ -1515,7 +1518,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/pics/hicolor/Makefile.in kdebase-3.4.0/pics/hicolor/Makefile.in
--- kdebase-3.4.0.orig/pics/hicolor/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/pics/hicolor/Makefile.in 2005-03-04 19:44:58.000000000 -0500
++++ kdebase-3.4.0/pics/hicolor/Makefile.in 2005-03-18 14:34:41.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -48685,13 +51724,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -735,7 +738,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nrua kdebase-3.4.0.orig/pics/wallpapers/Makefile.in kdebase-3.4.0/pics/wallpapers/Makefile.in
--- kdebase-3.4.0.orig/pics/wallpapers/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/pics/wallpapers/Makefile.in 2005-03-04 19:44:58.000000000 -0500
++++ kdebase-3.4.0/pics/wallpapers/Makefile.in 2005-03-18 14:34:41.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -48740,3 +51789,12 @@
#>+ 2
docs-am:
+@@ -833,7 +836,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \