[Pkg-kde-commits] rev 2489 -
branches/kde-3.4.0/packages/kdebindings/debian/patches
Luk Claes
luk at costa.debian.org
Thu Dec 1 19:16:52 UTC 2005
Author: luk
Date: 2005-12-01 19:16:50 +0000 (Thu, 01 Dec 2005)
New Revision: 2489
Modified:
branches/kde-3.4.0/packages/kdebindings/debian/patches/98_buildprep.diff
Log:
buildprep update
Modified: branches/kde-3.4.0/packages/kdebindings/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebindings/debian/patches/98_buildprep.diff 2005-12-01 19:14:08 UTC (rev 2488)
+++ branches/kde-3.4.0/packages/kdebindings/debian/patches/98_buildprep.diff 2005-12-01 19:16:50 UTC (rev 2489)
@@ -1,73 +1,5 @@
#DPATCHLEVEL=0
# vi: ft=diff
---- Makefile.in
-+++ Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -230,6 +230,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -261,6 +264,7 @@
- RUBY_ARCHDIR = @RUBY_ARCHDIR@
- RUBY_LIBDIR = @RUBY_LIBDIR@
- RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
-+RUBY_RUBYLIBDIR = @RUBY_RUBYLIBDIR@
- RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
- RUBY_SITEDIR = @RUBY_SITEDIR@
- SET_MAKE = @SET_MAKE@
-@@ -421,7 +425,7 @@
- .SUFFIXES:
- am--refresh:
- @:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -463,12 +467,12 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- #>- cd $(srcdir) && $(AUTOCONF)
- #>+ 2
- cd $(srcdir) && rm -f configure
- cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
- config.h: stamp-h1
-@@ -480,7 +484,7 @@
- stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
- @rm -f stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status config.h
--$(srcdir)/config.h.in: $(am__configure_deps)
-+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_srcdir) && $(AUTOHEADER)
- rm -f stamp-h1
- touch $@
-@@ -899,7 +903,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=subdirs Makefile.in configure.in.bot configure.files config.h.in Makefile.am.in.wo kdebindings.lsm configure.in aclocal.m4 configure.in.in acinclude.m4 Makefile.am Makefile.am.in
-+KDE_DIST=stamp-h.in subdirs Makefile.in configure.in.bot configure.files config.h.in Makefile.am.in.wo kdebindings.lsm configure.in aclocal.m4 configure.in.in configure Makefile.am acinclude.m4 Makefile.am.in
-
- #>+ 2
- docs-am:
--- acinclude.m4
+++ acinclude.m4
@@ -1688,15 +1688,6 @@
@@ -169,7 +101,7 @@
fi
])
-@@ -5799,6 +5787,7 @@
+@@ -5795,6 +5783,7 @@
## the same distribution terms that you use for the rest of that program.
# serial 47 AC_PROG_LIBTOOL
@@ -177,7 +109,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -5858,7 +5847,7 @@
+@@ -5854,7 +5843,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -186,7 +118,7 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -6272,12 +6261,11 @@
+@@ -6268,12 +6257,11 @@
if AC_TRY_EVAL(ac_compile); then
case "`/usr/bin/file conftest.o`" in
*32-bit*)
@@ -200,7 +132,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -6289,7 +6277,6 @@
+@@ -6285,7 +6273,6 @@
esac
;;
*64-bit*)
@@ -208,7 +140,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -6419,7 +6406,7 @@
+@@ -6415,7 +6402,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
@@ -217,7 +149,7 @@
case $build_os in
msdosdjgpp*)
-@@ -6448,20 +6435,26 @@
+@@ -6444,20 +6431,26 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -249,7 +181,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.
-@@ -6611,7 +6604,7 @@
+@@ -6607,7 +6600,7 @@
lt_cv_dlopen_self=yes
])
;;
@@ -258,7 +190,7 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -6700,13 +6693,6 @@
+@@ -6696,13 +6689,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -272,7 +204,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.
-@@ -6730,8 +6716,11 @@
+@@ -6726,8 +6712,11 @@
fi
fi
chmod u+w .
@@ -286,7 +218,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -6848,7 +6837,7 @@
+@@ -6844,7 +6833,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -295,7 +227,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -6861,7 +6850,7 @@
+@@ -6857,7 +6846,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -304,7 +236,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -6871,7 +6860,20 @@
+@@ -6867,7 +6856,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -326,7 +258,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -6936,7 +6938,7 @@
+@@ -6932,7 +6934,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -335,7 +267,7 @@
;;
beos*)
-@@ -6961,7 +6963,7 @@
+@@ -6957,7 +6959,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -344,7 +276,7 @@
need_version=no
need_lib_prefix=no
-@@ -7026,7 +7028,7 @@
+@@ -7022,7 +7024,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -353,7 +285,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"`
-@@ -7049,7 +7051,7 @@
+@@ -7045,7 +7047,7 @@
dynamic_linker=no
;;
@@ -362,7 +294,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -7109,7 +7111,7 @@
+@@ -7105,7 +7107,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -371,7 +303,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -7124,7 +7126,7 @@
+@@ -7120,7 +7122,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -380,7 +312,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7135,7 +7137,7 @@
+@@ -7131,7 +7133,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -389,7 +321,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7197,22 +7199,19 @@
+@@ -7193,22 +7195,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'
@@ -418,7 +350,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,
-@@ -7222,6 +7221,30 @@
+@@ -7218,6 +7217,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -449,7 +381,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -7231,7 +7254,7 @@
+@@ -7227,7 +7250,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -458,7 +390,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -7260,7 +7283,7 @@
+@@ -7256,7 +7279,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -467,7 +399,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
-@@ -7280,7 +7303,7 @@
+@@ -7276,7 +7299,7 @@
os2*)
libname_spec='$name'
@@ -476,7 +408,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -7871,31 +7894,23 @@
+@@ -7867,31 +7890,23 @@
;;
cygwin*)
@@ -517,7 +449,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -7934,42 +7949,21 @@
+@@ -7930,42 +7945,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -567,7 +499,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
-@@ -7998,9 +7992,6 @@
+@@ -7994,9 +7988,6 @@
;;
osf3* | osf4* | osf5*)
@@ -577,7 +509,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -8010,7 +8001,6 @@
+@@ -8006,7 +7997,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -585,7 +517,7 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -8276,7 +8266,7 @@
+@@ -8272,7 +8262,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])
@@ -594,7 +526,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
-@@ -8326,7 +8316,7 @@
+@@ -8322,7 +8312,7 @@
fi
;;
@@ -603,7 +535,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -8336,29 +8326,29 @@
+@@ -8332,29 +8322,29 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -647,7 +579,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8366,8 +8356,8 @@
+@@ -8362,8 +8352,8 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -658,7 +590,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -8475,8 +8465,8 @@
+@@ -8471,8 +8461,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
@@ -669,7 +601,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8502,7 +8492,7 @@
+@@ -8498,7 +8488,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.
@@ -678,7 +610,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -8532,8 +8522,22 @@
+@@ -8528,8 +8518,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -703,7 +635,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -8579,15 +8583,16 @@
+@@ -8575,15 +8579,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -724,7 +656,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.
-@@ -8596,13 +8601,12 @@
+@@ -8592,13 +8597,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -740,7 +672,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -8617,7 +8621,7 @@
+@@ -8613,7 +8617,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.
@@ -749,7 +681,7 @@
fi
fi
;;
-@@ -8634,12 +8638,12 @@
+@@ -8630,12 +8634,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'
@@ -764,7 +696,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
-@@ -8648,7 +8652,7 @@
+@@ -8644,7 +8648,7 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -773,7 +705,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -8659,20 +8663,20 @@
+@@ -8655,20 +8659,20 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -804,7 +736,7 @@
fi
;;
esac
-@@ -8682,19 +8686,19 @@
+@@ -8678,19 +8682,19 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -830,7 +762,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8729,7 +8733,7 @@
+@@ -8725,7 +8729,7 @@
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
@@ -839,7 +771,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8751,7 +8755,7 @@
+@@ -8747,7 +8751,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
aCC)
@@ -848,7 +780,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8760,11 +8764,11 @@
+@@ -8756,11 +8760,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.
@@ -862,7 +794,7 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8821,7 +8825,7 @@
+@@ -8817,7 +8821,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -871,7 +803,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -8842,7 +8846,7 @@
+@@ -8838,7 +8842,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -880,7 +812,7 @@
;;
esac
fi
-@@ -8857,7 +8861,7 @@
+@@ -8853,7 +8857,7 @@
case $cc_basename in
CC)
# SGI C++
@@ -889,7 +821,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -8868,9 +8872,9 @@
+@@ -8864,9 +8868,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -901,7 +833,7 @@
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -8887,8 +8891,8 @@
+@@ -8883,8 +8887,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.
@@ -912,7 +844,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8910,16 +8914,16 @@
+@@ -8906,16 +8910,16 @@
# Intel C++
with_gnu_ld=yes
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -933,7 +865,7 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8957,7 +8961,7 @@
+@@ -8953,7 +8957,7 @@
;;
esac
;;
@@ -942,7 +874,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=
-@@ -8976,7 +8980,7 @@
+@@ -8972,7 +8976,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.
@@ -951,7 +883,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8993,7 +8997,7 @@
+@@ -8989,7 +8993,7 @@
;;
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -960,7 +892,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9011,7 +9015,7 @@
+@@ -9007,7 +9011,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -969,7 +901,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9036,7 +9040,7 @@
+@@ -9032,7 +9036,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.
@@ -978,7 +910,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9052,10 +9056,10 @@
+@@ -9048,10 +9052,10 @@
;;
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
@@ -991,7 +923,7 @@
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9074,7 +9078,7 @@
+@@ -9070,7 +9074,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1000,7 +932,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9131,9 +9135,9 @@
+@@ -9127,9 +9131,9 @@
CC)
# Sun C++ 4.2, 5.x and Centerline C++
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -1012,7 +944,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -9167,7 +9171,7 @@
+@@ -9163,7 +9167,7 @@
;;
gcx)
# Green Hills C++ Compiler
@@ -1021,7 +953,7 @@
# The C++ compiler must be used to create the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9177,9 +9181,9 @@
+@@ -9173,9 +9177,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
@@ -1033,7 +965,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9188,9 +9192,9 @@
+@@ -9184,9 +9188,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -1045,7 +977,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9358,7 +9362,7 @@
+@@ -9354,7 +9358,7 @@
fi
;;
@@ -1054,7 +986,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -9467,7 +9471,7 @@
+@@ -9463,7 +9467,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -1063,7 +995,7 @@
test "$enable_shared" = yes && enable_static=no
;;
esac
-@@ -9609,11 +9613,12 @@
+@@ -9605,11 +9609,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -1078,7 +1010,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 \
-@@ -9663,7 +9668,7 @@
+@@ -9659,7 +9664,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -1087,7 +1019,7 @@
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9794,7 +9799,7 @@
+@@ -9790,7 +9795,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -1096,7 +1028,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -9825,7 +9830,7 @@
+@@ -9821,7 +9826,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -1105,7 +1037,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -10069,7 +10074,10 @@
+@@ -10065,7 +10070,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.
@@ -1117,7 +1049,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -10142,7 +10150,7 @@
+@@ -10138,7 +10146,7 @@
symcode='[[BCDEGQRST]]'
;;
solaris* | sysv5*)
@@ -1126,7 +1058,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -10160,7 +10168,7 @@
+@@ -10156,7 +10164,7 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -1135,7 +1067,7 @@
esac
# Try without a prefix undercore, then with it.
-@@ -10375,7 +10383,7 @@
+@@ -10371,7 +10379,7 @@
;;
esac
;;
@@ -1144,7 +1076,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -10426,7 +10434,7 @@
+@@ -10422,7 +10430,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'
@@ -1153,7 +1085,7 @@
cxx)
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -10451,7 +10459,7 @@
+@@ -10447,7 +10455,7 @@
;;
esac
;;
@@ -1162,7 +1094,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -10762,6 +10770,9 @@
+@@ -10758,6 +10766,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'
;;
@@ -1172,7 +1104,7 @@
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -10786,7 +10797,7 @@
+@@ -10782,7 +10793,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -1181,7 +1113,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*
-@@ -10860,7 +10871,7 @@
+@@ -10856,7 +10867,7 @@
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -1190,7 +1122,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10870,13 +10881,13 @@
+@@ -10866,13 +10877,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'
@@ -1206,7 +1138,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
-@@ -10885,19 +10896,19 @@
+@@ -10881,19 +10892,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -1230,7 +1162,7 @@
fi
;;
-@@ -10915,8 +10926,8 @@
+@@ -10911,8 +10922,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -1241,7 +1173,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10929,10 +10940,36 @@
+@@ -10925,10 +10936,36 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
@@ -1280,7 +1212,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10982,9 +11019,20 @@
+@@ -10978,9 +11015,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
@@ -1303,7 +1235,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -11030,29 +11078,29 @@
+@@ -11026,29 +11074,29 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1342,7 +1274,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -11067,7 +11115,7 @@
+@@ -11063,7 +11111,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.
@@ -1351,7 +1283,7 @@
fi
fi
;;
-@@ -11090,13 +11138,13 @@
+@@ -11086,13 +11134,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -1368,7 +1300,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.
-@@ -11110,21 +11158,21 @@
+@@ -11106,21 +11154,21 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -1403,7 +1335,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -11133,26 +11181,26 @@
+@@ -11129,26 +11177,26 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -1438,7 +1370,7 @@
;;
dgux*)
-@@ -11185,8 +11233,8 @@
+@@ -11181,8 +11229,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -1449,7 +1381,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
-@@ -11194,7 +11242,7 @@
+@@ -11190,7 +11238,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -1458,7 +1390,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
-@@ -11212,10 +11260,10 @@
+@@ -11208,10 +11256,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -1471,7 +1403,7 @@
;;
esac
else
-@@ -11262,7 +11310,7 @@
+@@ -11258,7 +11306,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -1480,7 +1412,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'
-@@ -11272,7 +11320,7 @@
+@@ -11268,7 +11316,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -1489,7 +1421,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
-@@ -11295,7 +11343,7 @@
+@@ -11291,7 +11339,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
@@ -1498,7 +1430,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
else
-@@ -11305,7 +11353,7 @@
+@@ -11301,7 +11349,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
;;
*)
@@ -1507,7 +1439,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
esac
-@@ -11316,14 +11364,14 @@
+@@ -11312,14 +11360,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
@@ -1524,7 +1456,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'
-@@ -11335,7 +11383,7 @@
+@@ -11331,7 +11379,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}\*'
@@ -1533,7 +1465,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-@@ -11360,9 +11408,9 @@
+@@ -11356,9 +11404,9 @@
solaris*)
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
if test "$GCC" = yes; then
@@ -1545,7 +1477,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~
-@@ -11382,7 +11430,7 @@
+@@ -11378,7 +11426,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.
@@ -1554,7 +1486,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -11442,9 +11490,9 @@
+@@ -11438,9 +11486,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
_LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -1566,7 +1498,7 @@
fi
runpath_var='LD_RUN_PATH'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11502,7 +11550,7 @@
+@@ -11498,7 +11546,7 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -1575,7 +1507,7 @@
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -11661,8 +11709,8 @@
+@@ -11657,8 +11705,8 @@
fi
done
done
@@ -9310,7 +9242,7 @@
+++ configure.in
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdebindings, "3.4.2") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdebindings, "3.4.3") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
@@ -9346,22 +9278,7 @@
fi
--- dcopc/Makefile.in
+++ dcopc/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libdcopc_la_SOURCES) $(glibtest_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -228,6 +226,9 @@
+@@ -226,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9371,7 +9288,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -259,6 +260,7 @@
+@@ -257,6 +260,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -9379,7 +9296,7 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -425,7 +427,7 @@
+@@ -423,7 +427,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -9388,7 +9305,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -463,9 +465,9 @@
+@@ -461,9 +465,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9400,71 +9317,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- dcopjava/Makefile.in
-+++ dcopjava/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -200,6 +200,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -231,6 +234,7 @@
- RUBY_ARCHDIR = @RUBY_ARCHDIR@
- RUBY_LIBDIR = @RUBY_LIBDIR@
- RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
-+RUBY_RUBYLIBDIR = @RUBY_RUBYLIBDIR@
- RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
- RUBY_SITEDIR = @RUBY_SITEDIR@
- SET_MAKE = @SET_MAKE@
-@@ -386,7 +390,7 @@
- all: docs-am all-recursive
-
- .SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -424,9 +428,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
--- dcopjava/binding/Makefile.in
+++ dcopjava/binding/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libjavadcop_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -239,6 +237,9 @@
+@@ -237,6 +237,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9474,7 +9329,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -270,6 +271,7 @@
+@@ -268,6 +271,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -9482,7 +9337,7 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -432,7 +434,7 @@
+@@ -430,7 +434,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9491,7 +9346,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -470,9 +472,9 @@
+@@ -468,9 +472,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9503,32 +9358,26 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -827,10 +829,13 @@
+@@ -825,10 +829,13 @@
uninstall-info-am uninstall-libLTLIBRARIES
-client.cpp: org_kde_DCOP_Client.h
+client.$(OBJEXT): org_kde_DCOP_Client.h
-+
-+client.lo: org_kde_DCOP_Client.h
-org_kde_DCOP_Client.h: org/kde/DCOP/Client.class
- CLASSPATH=$(srcdir) $(JAVAH) -jni org.kde.DCOP.Client
++client.lo: org_kde_DCOP_Client.h
++
+org_kde_DCOP_Client.h:
+ $(MAKE) -C org
+ CLASSPATH=.:$(srcdir) $(JAVAH) -jni org.kde.DCOP.Client
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
---- dcopjava/binding/org/Makefile.in
-+++ dcopjava/binding/org/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -200,6 +200,9 @@
+--- dcopjava/binding/org/kde/DCOP/Makefile.in
++++ dcopjava/binding/org/kde/DCOP/Makefile.in
+@@ -194,6 +194,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9538,7 +9387,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -231,6 +234,7 @@
+@@ -225,6 +228,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -9546,16 +9395,16 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -386,7 +390,7 @@
- all: docs-am all-recursive
+@@ -384,7 +388,7 @@
.SUFFIXES:
+ .SUFFIXES: .java .class
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -424,9 +428,9 @@
+@@ -422,9 +426,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9567,15 +9416,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- dcopjava/binding/org/kde/DCOP/Makefile.in
-+++ dcopjava/binding/org/kde/DCOP/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -194,6 +194,9 @@
+--- dcopjava/binding/org/kde/Makefile.in
++++ dcopjava/binding/org/kde/Makefile.in
+@@ -200,6 +200,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9585,7 +9428,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -225,6 +228,7 @@
+@@ -231,6 +234,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -9593,16 +9436,16 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -384,7 +388,7 @@
+@@ -386,7 +390,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .java .class
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -422,9 +426,9 @@
+@@ -424,9 +428,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9614,14 +9457,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- dcopjava/binding/org/kde/Makefile.in
-+++ dcopjava/binding/org/kde/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
+--- dcopjava/binding/org/Makefile.in
++++ dcopjava/binding/org/Makefile.in
@@ -200,6 +200,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -9663,22 +9500,7 @@
mostlyclean-libtool:
--- dcopjava/dcopidl2java/Makefile.in
+++ dcopjava/dcopidl2java/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(dcopidl2java_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -228,6 +226,9 @@
+@@ -226,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9688,7 +9510,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -259,6 +260,7 @@
+@@ -257,6 +260,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -9696,7 +9518,7 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -419,7 +421,7 @@
+@@ -417,7 +421,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9705,7 +9527,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -457,9 +459,9 @@
+@@ -455,9 +459,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9717,24 +9539,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
---- dcopjava/tests/Makefile.in
-+++ dcopjava/tests/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -14,8 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--SOURCES = $(server_SOURCES) $(test_class_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -230,6 +228,9 @@
+--- dcopjava/Makefile.in
++++ dcopjava/Makefile.in
+@@ -200,6 +200,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9744,7 +9551,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -261,6 +262,7 @@
+@@ -231,6 +234,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -9752,16 +9559,16 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -424,7 +426,7 @@
+@@ -386,7 +390,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cpp .java .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -462,9 +464,9 @@
+@@ -424,9 +428,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9772,16 +9579,10 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- clean-checkPROGRAMS:
---- dcoppython/Makefile.in
-+++ dcoppython/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -200,6 +200,9 @@
+ mostlyclean-libtool:
+--- dcopjava/tests/Makefile.in
++++ dcopjava/tests/Makefile.in
+@@ -228,6 +228,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9791,7 +9592,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -231,6 +234,7 @@
+@@ -259,6 +262,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -9799,16 +9600,16 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -386,7 +390,7 @@
- all: docs-am all-recursive
+@@ -422,7 +426,7 @@
.SUFFIXES:
+ .SUFFIXES: .cpp .java .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -424,9 +428,9 @@
+@@ -460,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9819,15 +9620,9 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- mostlyclean-libtool:
+ clean-checkPROGRAMS:
--- dcoppython/lib/Makefile.in
+++ dcoppython/lib/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -194,6 +194,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -9874,24 +9669,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- dcoppython/shell/Makefile.in
-+++ dcoppython/shell/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(pcop_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -231,6 +229,9 @@
+--- dcoppython/Makefile.in
++++ dcoppython/Makefile.in
+@@ -200,6 +200,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9901,7 +9681,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -262,6 +263,7 @@
+@@ -231,6 +234,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -9909,16 +9689,16 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -427,7 +429,7 @@
+@@ -386,7 +390,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -465,9 +467,9 @@
+@@ -424,9 +428,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9928,17 +9708,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-pythlibLTLIBRARIES: $(pythlib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
---- dcoppython/test/Makefile.in
-+++ dcoppython/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-@@ -184,6 +184,9 @@
+ mostlyclean-libtool:
+--- dcoppython/shell/Makefile.in
++++ dcoppython/shell/Makefile.in
+@@ -229,6 +229,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9948,7 +9722,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -215,6 +218,7 @@
+@@ -260,6 +263,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -9956,16 +9730,16 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -370,7 +374,7 @@
- all: docs-am all-am
+@@ -425,7 +429,7 @@
.SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -408,9 +412,9 @@
+@@ -463,9 +467,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9975,35 +9749,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
-@@ -549,7 +553,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=test.py README-server Makefile.in test4.py automate_presentation.py signal.py Makefile.am server.py test3.py test2.py
-+KDE_DIST=test.py README-server Makefile.in test4.py automate_presentation.py signal.py Makefile.am test3.py server.py test2.py
-
- #>+ 2
- docs-am:
+ install-pythlibLTLIBRARIES: $(pythlib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
--- dcoppython/test/dcopserver/Makefile.in
+++ dcoppython/test/dcopserver/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kdedcoptest_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -239,6 +237,9 @@
+@@ -237,6 +237,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10013,7 +9763,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -270,6 +271,7 @@
+@@ -268,6 +271,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -10021,7 +9771,7 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -450,7 +452,7 @@
+@@ -448,7 +452,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10030,7 +9780,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -488,9 +490,9 @@
+@@ -486,9 +490,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10042,42 +9792,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -807,7 +809,7 @@
- -rm -f kdedcoptest.moc
-
- #>+ 2
--KDE_DIST=Makefile.in kdedcoptest.desktop gen.py kdedcoptestui.rc mainclass.h hi32-app-kdedcoptest.png hi16-app-kdedcoptest.png Makefile.am
-+KDE_DIST=Makefile.in kdedcoptest.desktop gen.py kdedcoptestui.rc mainclass.h hi16-app-kdedcoptest.png hi32-app-kdedcoptest.png Makefile.am
-
- #>+ 4
- clean-idl:
-@@ -819,14 +821,14 @@
-
- #>+ 10
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/hi16-app-kdedcoptest.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdedcoptest.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
- $(INSTALL_DATA) $(srcdir)/hi32-app-kdedcoptest.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdedcoptest.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/hi16-app-kdedcoptest.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdedcoptest.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdedcoptest.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdedcoptest.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdedcoptest.png
-
- #>+ 15
- force-reedit:
---- kdejava/Makefile.in
-+++ kdejava/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -203,6 +203,9 @@
+--- dcoppython/test/Makefile.in
++++ dcoppython/test/Makefile.in
+@@ -184,6 +184,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10087,7 +9804,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -234,6 +237,7 @@
+@@ -215,6 +218,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -10095,8 +9812,8 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -390,7 +394,7 @@
- all: docs-am all-recursive
+@@ -370,7 +374,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -10104,7 +9821,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -428,9 +432,9 @@
+@@ -408,9 +412,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10116,219 +9833,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kdejava/koala/Makefile.in
-+++ kdejava/koala/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(koala_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -41,7 +39,7 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
--bin_PROGRAMS = koala$(EXEEXT)
-+noinst_PROGRAMS = koala$(EXEEXT)
- subdir = kdejava/koala
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -52,15 +50,14 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
--am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(datadir)"
--binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
--PROGRAMS = $(bin_PROGRAMS)
-+PROGRAMS = $(noinst_PROGRAMS)
- am_koala_OBJECTS = main.$(OBJEXT)
- #>- koala_OBJECTS = $(am_koala_OBJECTS)
- #>+ 1
- koala_OBJECTS = main.$(OBJEXT)
- am__DEPENDENCIES_1 =
--koala_DEPENDENCIES = ./kdejava/libkdejava.la $(am__DEPENDENCIES_1) \
-+koala_DEPENDENCIES = ./kdejava/libkdejava.la \
-+ ../../qtjava/javalib/qtjava/libqtjava.la $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-@@ -104,6 +101,7 @@
- *) f=$$p;; \
- esac;
- am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(datadir)"
- dataDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(data_DATA)
- ETAGS = etags
-@@ -244,6 +242,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -275,6 +276,7 @@
- RUBY_ARCHDIR = @RUBY_ARCHDIR@
- RUBY_LIBDIR = @RUBY_LIBDIR@
- RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
-+RUBY_RUBYLIBDIR = @RUBY_RUBYLIBDIR@
- RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
- RUBY_SITEDIR = @RUBY_SITEDIR@
- SET_MAKE = @SET_MAKE@
-@@ -425,7 +427,7 @@
- xparts_SUBDIR_included_FALSE = @xparts_SUBDIR_included_FALSE@
- xparts_SUBDIR_included_TRUE = @xparts_SUBDIR_included_TRUE@
- koala_SOURCES = main.cpp
--koala_LDADD = ./kdejava/libkdejava.la $(LIB_KSPELL) -lqtjava -lkparts $(LIB_KIO) -lXext -lX11 $(LIBSOCKET)
-+koala_LDADD = ./kdejava/libkdejava.la ../../qtjava/javalib/qtjava/libqtjava.la $(LIB_KSPELL) -lkparts $(LIB_KIO) -lXext -lX11 $(LIBSOCKET)
- SUBDIRS = org kdejava
- EXTRA_DIST = main.cpp
-
-@@ -459,7 +461,7 @@
-
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -497,34 +499,13 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--install-binPROGRAMS: $(bin_PROGRAMS)
-- @$(NORMAL_INSTALL)
-- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-- @list='$(bin_PROGRAMS)'; for p in $$list; do \
-- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-- if test -f $$p \
-- || test -f $$p1 \
-- ; then \
-- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-- else :; fi; \
-- done
-
--uninstall-binPROGRAMS:
-- @$(NORMAL_UNINSTALL)
-- @list='$(bin_PROGRAMS)'; for p in $$list; do \
-- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-- rm -f "$(DESTDIR)$(bindir)/$$f"; \
-- done
--
--clean-binPROGRAMS:
-- @list='$(bin_PROGRAMS)'; for p in $$list; do \
-+clean-noinstPROGRAMS:
-+ @list='$(noinst_PROGRAMS)'; for p in $$list; do \
- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f $$p $$f"; \
- rm -f $$p $$f ; \
-@@ -768,7 +749,7 @@
- all-am: Makefile $(PROGRAMS) $(DATA)
- installdirs: installdirs-recursive
- installdirs-am:
-- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(datadir)"; do \
-+ for dir in "$(DESTDIR)$(datadir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
- done
- install: install-recursive
-@@ -800,9 +781,11 @@
- #>+ 1
- clean: kde-rpo-clean clean-recursive
-
--#>- clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
--#>+ 1
--clean-am: clean-bcheck clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-+#>- clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
-+#>- mostlyclean-am
-+#>+ 2
-+clean-am: clean-bcheck clean-generic clean-libtool clean-noinstPROGRAMS \
-+ mostlyclean-am
-
- distclean: distclean-recursive
- -rm -rf ./$(DEPDIR)
-@@ -822,7 +805,7 @@
-
- install-data-am: install-dataDATA
-
--install-exec-am: install-binPROGRAMS
-+install-exec-am:
-
- install-info: install-info-recursive
-
-@@ -848,25 +831,24 @@
-
- ps-am:
-
--uninstall-am: uninstall-binPROGRAMS uninstall-dataDATA \
-- uninstall-info-am
-+uninstall-am: uninstall-dataDATA uninstall-info-am
-
- uninstall-info: uninstall-info-recursive
-
- .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-- clean clean-binPROGRAMS clean-generic clean-libtool \
-+ clean clean-generic clean-libtool clean-noinstPROGRAMS \
- clean-recursive ctags ctags-recursive distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-recursive distclean-tags distdir dvi dvi-am html \
-- html-am info info-am install install-am install-binPROGRAMS \
-- install-data install-data-am install-dataDATA install-exec \
-- install-exec-am install-info install-info-am install-man \
-- install-strip installcheck installcheck-am installdirs \
-- installdirs-am maintainer-clean maintainer-clean-generic \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-dataDATA install-exec install-exec-am \
-+ install-info install-info-am install-man install-strip \
-+ installcheck installcheck-am installdirs installdirs-am \
-+ maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
- pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-- uninstall-binPROGRAMS uninstall-dataDATA uninstall-info-am
-+ uninstall-dataDATA uninstall-info-am
-
-
- koala.jar: org/kde/koala/classnoinst.stamp
--- kdejava/koala/kdejava/Makefile.in
+++ kdejava/koala/kdejava/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkdejava_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -58,9 +56,9 @@
+@@ -56,9 +56,9 @@
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
@@ -10341,7 +9848,7 @@
am__DEPENDENCIES_1 =
libkdejava_la_DEPENDENCIES = \
$(top_builddir)/qtjava/javalib/qtjava/libqtjavasupport.la \
-@@ -233,9 +231,8 @@
+@@ -231,9 +231,8 @@
KAboutContainer.lo KAboutApplication.lo DCOPObjectProxy.lo \
DCOPObject.lo DCOPClient.lo BrowserExtension.lo
#>- libkdejava_la_OBJECTS = $(am_libkdejava_la_OBJECTS)
@@ -10353,7 +9860,7 @@
BrowserHostExtension.lo WindowArgs.lo URLArgs.lo \
PartManager.lo KNamedCommand.lo KSSLCertBox.lo TextEvent.lo \
StatusBarExtension.lo SkipDlg.lo SessionData.lo \
-@@ -401,8 +398,6 @@
+@@ -399,8 +398,6 @@
KAboutPerson.lo KAboutKDE.lo KAboutDialog.lo KAboutData.lo \
KAboutContainer.lo KAboutApplication.lo DCOPObjectProxy.lo \
DCOPObject.lo DCOPClient.lo BrowserExtension.lo
@@ -10362,7 +9869,7 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
-@@ -564,6 +559,9 @@
+@@ -562,6 +559,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10372,7 +9879,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -595,6 +593,7 @@
+@@ -593,6 +593,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -10380,7 +9887,7 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -746,7 +745,8 @@
+@@ -744,7 +745,8 @@
xparts_SUBDIR_included_TRUE = @xparts_SUBDIR_included_TRUE@
####### kdevelop will overwrite this part!!! (begin)##########
@@ -10390,7 +9897,7 @@
AM_LDFLAGS =
libkdejava_la_SOURCES = StoredTransferJob.cpp BrowserRun.cpp \
BrowserHostExtension.cpp WindowArgs.cpp URLArgs.cpp \
-@@ -1280,14 +1280,14 @@
+@@ -1278,14 +1280,14 @@
#>+ 1
libkdejava_la_LDFLAGS = $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED) -version-info $(SOMAJOR):$(SOMINOR):$(SOSUBMINOR)
libkdejava_la_LIBADD = $(top_builddir)/qtjava/javalib/qtjava/libqtjavasupport.la -lkmdi $(LIB_KHTML) $(LIB_KSPELL) $(LIB_KIO)
@@ -10407,7 +9914,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -1325,32 +1325,32 @@
+@@ -1323,32 +1325,32 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10454,7 +9961,7 @@
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
test "$$dir" != "$$p" || dir=.; \
echo "rm -f \"$${dir}/so_locations\""; \
-@@ -1360,7 +1360,7 @@
+@@ -1358,7 +1360,7 @@
#>+ 2
@KDE_USE_CLOSURE_TRUE at libkdejava.la: libkdejava.la.closure $(libkdejava_la_OBJECTS) $(libkdejava_la_DEPENDENCIES)
@KDE_USE_CLOSURE_FALSE at libkdejava.la: $(libkdejava_la_OBJECTS) $(libkdejava_la_DEPENDENCIES)
@@ -10463,7 +9970,7 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-@@ -2028,7 +2028,7 @@
+@@ -2026,7 +2028,7 @@
check: check-am
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
installdirs:
@@ -10472,7 +9979,7 @@
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
-@@ -2059,10 +2059,10 @@
+@@ -2057,10 +2059,10 @@
#>+ 1
clean: kde-rpo-clean clean-am
@@ -10485,7 +9992,7 @@
mostlyclean-am
distclean: distclean-am
-@@ -2081,9 +2081,9 @@
+@@ -2079,9 +2081,9 @@
info-am:
@@ -10497,7 +10004,7 @@
install-info: install-info-am
-@@ -2109,20 +2109,20 @@
+@@ -2107,20 +2109,20 @@
ps-am:
@@ -10523,7 +10030,7 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-@@ -2196,37 +2196,21 @@
+@@ -2194,37 +2196,21 @@
done
@@ -10565,15 +10072,45 @@
#>+ 3
cvs-clean:
---- kdejava/koala/org/Makefile.in
-+++ kdejava/koala/org/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -202,6 +202,9 @@
+--- kdejava/koala/Makefile.in
++++ kdejava/koala/Makefile.in
+@@ -39,7 +39,7 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
+-bin_PROGRAMS = koala$(EXEEXT)
++noinst_PROGRAMS = koala$(EXEEXT)
+ subdir = kdejava/koala
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -50,15 +50,14 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(datadir)"
+-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-PROGRAMS = $(bin_PROGRAMS)
++PROGRAMS = $(noinst_PROGRAMS)
+ am_koala_OBJECTS = main.$(OBJEXT)
+ #>- koala_OBJECTS = $(am_koala_OBJECTS)
+ #>+ 1
+ koala_OBJECTS = main.$(OBJEXT)
+ am__DEPENDENCIES_1 =
+-koala_DEPENDENCIES = ./kdejava/libkdejava.la $(am__DEPENDENCIES_1) \
++koala_DEPENDENCIES = ./kdejava/libkdejava.la \
++ ../../qtjava/javalib/qtjava/libqtjava.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+@@ -102,6 +101,7 @@
+ *) f=$$p;; \
+ esac;
+ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(datadir)"
+ dataDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(data_DATA)
+ ETAGS = etags
+@@ -242,6 +242,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10583,7 +10120,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -233,6 +236,7 @@
+@@ -273,6 +276,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -10591,16 +10128,25 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -388,7 +392,7 @@
- all: docs-am all-recursive
+@@ -423,7 +427,7 @@
+ xparts_SUBDIR_included_FALSE = @xparts_SUBDIR_included_FALSE@
+ xparts_SUBDIR_included_TRUE = @xparts_SUBDIR_included_TRUE@
+ koala_SOURCES = main.cpp
+-koala_LDADD = ./kdejava/libkdejava.la $(LIB_KSPELL) -lqtjava -lkparts $(LIB_KIO) -lXext -lX11 $(LIBSOCKET)
++koala_LDADD = ./kdejava/libkdejava.la ../../qtjava/javalib/qtjava/libqtjava.la $(LIB_KSPELL) -lkparts $(LIB_KIO) -lXext -lX11 $(LIBSOCKET)
+ SUBDIRS = org kdejava
+ EXTRA_DIST = main.cpp
+@@ -457,7 +461,7 @@
+
.SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -426,9 +430,9 @@
+@@ -495,34 +499,13 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10610,17 +10156,105 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-install-binPROGRAMS: $(bin_PROGRAMS)
+- @$(NORMAL_INSTALL)
+- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+- @list='$(bin_PROGRAMS)'; for p in $$list; do \
+- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+- if test -f $$p \
+- || test -f $$p1 \
+- ; then \
+- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+- else :; fi; \
+- done
- mostlyclean-libtool:
---- kdejava/koala/org/kde/Makefile.in
-+++ kdejava/koala/org/kde/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
+-uninstall-binPROGRAMS:
+- @$(NORMAL_UNINSTALL)
+- @list='$(bin_PROGRAMS)'; for p in $$list; do \
+- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+- rm -f "$(DESTDIR)$(bindir)/$$f"; \
+- done
+-
+-clean-binPROGRAMS:
+- @list='$(bin_PROGRAMS)'; for p in $$list; do \
++clean-noinstPROGRAMS:
++ @list='$(noinst_PROGRAMS)'; for p in $$list; do \
+ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f $$p $$f"; \
+ rm -f $$p $$f ; \
+@@ -766,7 +749,7 @@
+ all-am: Makefile $(PROGRAMS) $(DATA)
+ installdirs: installdirs-recursive
+ installdirs-am:
+- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(datadir)"; do \
++ for dir in "$(DESTDIR)$(datadir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-recursive
+@@ -798,9 +781,11 @@
+ #>+ 1
+ clean: kde-rpo-clean clean-recursive
-@@ -202,6 +202,9 @@
+-#>- clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+-#>+ 1
+-clean-am: clean-bcheck clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
++#>- clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
++#>- mostlyclean-am
++#>+ 2
++clean-am: clean-bcheck clean-generic clean-libtool clean-noinstPROGRAMS \
++ mostlyclean-am
+
+ distclean: distclean-recursive
+ -rm -rf ./$(DEPDIR)
+@@ -820,7 +805,7 @@
+
+ install-data-am: install-dataDATA
+
+-install-exec-am: install-binPROGRAMS
++install-exec-am:
+
+ install-info: install-info-recursive
+
+@@ -846,25 +831,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-binPROGRAMS uninstall-dataDATA \
+- uninstall-info-am
++uninstall-am: uninstall-dataDATA uninstall-info-am
+
+ uninstall-info: uninstall-info-recursive
+
+ .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+- clean clean-binPROGRAMS clean-generic clean-libtool \
++ clean clean-generic clean-libtool clean-noinstPROGRAMS \
+ clean-recursive ctags ctags-recursive distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-recursive distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-am install-binPROGRAMS \
+- install-data install-data-am install-dataDATA install-exec \
+- install-exec-am install-info install-info-am install-man \
+- install-strip installcheck installcheck-am installdirs \
+- installdirs-am maintainer-clean maintainer-clean-generic \
++ html-am info info-am install install-am install-data \
++ install-data-am install-dataDATA install-exec install-exec-am \
++ install-info install-info-am install-man install-strip \
++ installcheck installcheck-am installdirs installdirs-am \
++ maintainer-clean maintainer-clean-generic \
+ maintainer-clean-recursive mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+- uninstall-binPROGRAMS uninstall-dataDATA uninstall-info-am
++ uninstall-dataDATA uninstall-info-am
+
+
+ koala.jar: org/kde/koala/classnoinst.stamp
+--- kdejava/koala/org/kde/koala/Makefile.in
++++ kdejava/koala/org/kde/koala/Makefile.in
+@@ -188,6 +188,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10630,7 +10264,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -233,6 +236,7 @@
+@@ -219,6 +222,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -10638,8 +10272,17 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -388,7 +392,7 @@
- all: docs-am all-recursive
+@@ -648,14 +652,14 @@
+ #javadir = $(kde_libraries)/java/org/kde/koala
+ #install-data-hook: uninstall-javaJAVA
+ JAVAROOT = ../../..
+-CLASSPATH = $(srcdir)/../../..:$(srcdir)/../../../../../qtjava/javalib/qtjava.jar:$(srcdir)
+-JAVACFLAGS = -classpath $(CLASSPATH)
++CLASSPATH = ../../..:../../../../../qtjava/javalib/qtjava.jar:.
++JAVACFLAGS = -classpath $(CLASSPATH) -encoding iso-8859-1
+ #>- all: all-am
+ #>+ 1
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -10647,7 +10290,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -426,9 +430,9 @@
+@@ -693,9 +697,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10659,15 +10302,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kdejava/koala/org/kde/koala/Makefile.in
-+++ kdejava/koala/org/kde/koala/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -188,6 +188,9 @@
+--- kdejava/koala/org/kde/Makefile.in
++++ kdejava/koala/org/kde/Makefile.in
+@@ -202,6 +202,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10677,7 +10314,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -219,6 +222,7 @@
+@@ -233,6 +236,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -10685,17 +10322,8 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -648,14 +652,14 @@
- #javadir = $(kde_libraries)/java/org/kde/koala
- #install-data-hook: uninstall-javaJAVA
- JAVAROOT = ../../..
--CLASSPATH = $(srcdir)/../../..:$(srcdir)/../../../../../qtjava/javalib/qtjava.jar:$(srcdir)
--JAVACFLAGS = -classpath $(CLASSPATH)
-+CLASSPATH = ../../..:../../../../../qtjava/javalib/qtjava.jar:.
-+JAVACFLAGS = -classpath $(CLASSPATH) -encoding iso-8859-1
- #>- all: all-am
- #>+ 1
- all: docs-am all-am
+@@ -388,7 +392,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -10703,7 +10331,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -693,9 +697,9 @@
+@@ -426,9 +430,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10715,24 +10343,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kjsembed/Makefile.in
-+++ kjsembed/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -18,8 +18,6 @@
-
-
-
--SOURCES = $(libkjsembed_la_SOURCES) $(kjscmd_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -287,6 +285,9 @@
+--- kdejava/koala/org/Makefile.in
++++ kdejava/koala/org/Makefile.in
+@@ -202,6 +202,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10742,7 +10355,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -318,6 +319,7 @@
+@@ -233,6 +236,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -10750,16 +10363,16 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -537,7 +539,7 @@
+@@ -388,7 +392,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -575,9 +577,9 @@
+@@ -426,9 +430,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10769,26 +10382,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
---- kjsembed/bindings/Makefile.in
-+++ kjsembed/bindings/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libkjsembedbindings_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -231,6 +229,9 @@
+ mostlyclean-libtool:
+--- kdejava/Makefile.in
++++ kdejava/Makefile.in
+@@ -203,6 +203,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10798,7 +10396,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -262,6 +263,7 @@
+@@ -234,6 +237,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -10806,16 +10404,16 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -441,7 +443,7 @@
+@@ -390,7 +394,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -479,9 +481,9 @@
+@@ -428,9 +432,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10826,64 +10424,10 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- clean-noinstLTLIBRARIES:
-@@ -752,22 +754,22 @@
- mocs: kconfig_imp.moc
-
- #>+ 3
--netaccess_imp.moc: $(srcdir)/netaccess_imp.h
-- $(MOC) $(srcdir)/netaccess_imp.h -o netaccess_imp.moc
-+dcop_imp.moc: $(srcdir)/dcop_imp.h
-+ $(MOC) $(srcdir)/dcop_imp.h -o dcop_imp.moc
-
- #>+ 2
--mocs: netaccess_imp.moc
-+mocs: dcop_imp.moc
-
- #>+ 3
--dcop_imp.moc: $(srcdir)/dcop_imp.h
-- $(MOC) $(srcdir)/dcop_imp.h -o dcop_imp.moc
-+netaccess_imp.moc: $(srcdir)/netaccess_imp.h
-+ $(MOC) $(srcdir)/netaccess_imp.h -o netaccess_imp.moc
-
- #>+ 2
--mocs: dcop_imp.moc
-+mocs: netaccess_imp.moc
-
- #>+ 3
- clean-metasources:
-- -rm -f bindingobject.moc movie_imp.moc sql_imp.moc kconfig_imp.moc netaccess_imp.moc dcop_imp.moc
-+ -rm -f bindingobject.moc movie_imp.moc sql_imp.moc kconfig_imp.moc dcop_imp.moc netaccess_imp.moc
-
- #>+ 2
- KDE_DIST=point_imp.h sql_imp.h kconfig_imp.h pen_imp.h size_imp.h movie_imp.h brush_imp.h iconset_imp.h netaccess_imp.h painter_imp.h bindingobject.h Makefile.am bindings.pro rect_imp.h Makefile.in image_imp.h pixmap_imp.h dcop_imp.h
-@@ -814,7 +816,7 @@
-
-
- #>+ 11
--libkjsembedbindings_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/image_imp.cpp $(srcdir)/dcop_imp.cpp $(srcdir)/painter_imp.cpp $(srcdir)/pixmap_imp.cpp $(srcdir)/netaccess_imp.cpp $(srcdir)/kconfig_imp.cpp $(srcdir)/bindingobject.cpp $(srcdir)/movie_imp.cpp $(srcdir)/sql_imp.cpp $(srcdir)/pen_imp.cpp $(srcdir)/brush_imp.cpp $(srcdir)/iconset_imp.cpp $(srcdir)/point_imp.cpp $(srcdir)/rect_imp.cpp $(srcdir)/size_imp.cpp bindingobject.moc movie_imp.moc sql_imp.moc kconfig_imp.moc dcop_imp.moc netaccess_imp.moc
-+libkjsembedbindings_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/image_imp.cpp $(srcdir)/dcop_imp.cpp $(srcdir)/painter_imp.cpp $(srcdir)/pixmap_imp.cpp $(srcdir)/netaccess_imp.cpp $(srcdir)/kconfig_imp.cpp $(srcdir)/bindingobject.cpp $(srcdir)/movie_imp.cpp $(srcdir)/sql_imp.cpp $(srcdir)/pen_imp.cpp $(srcdir)/brush_imp.cpp $(srcdir)/iconset_imp.cpp $(srcdir)/point_imp.cpp $(srcdir)/rect_imp.cpp $(srcdir)/size_imp.cpp bindingobject.moc movie_imp.moc sql_imp.moc kconfig_imp.moc netaccess_imp.moc dcop_imp.moc
- @echo 'creating libkjsembedbindings_la.all_cpp.cpp ...'; \
- rm -f libkjsembedbindings_la.all_cpp.files libkjsembedbindings_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkjsembedbindings_la.all_cpp.final; \
---- kjsembed/builtins/Makefile.in
-+++ kjsembed/builtins/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libkjsembedbuiltins_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -227,6 +225,9 @@
+ mostlyclean-libtool:
+--- kjsembed/bindings/Makefile.in
++++ kjsembed/bindings/Makefile.in
+@@ -229,6 +229,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10893,7 +10437,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -258,6 +259,7 @@
+@@ -260,6 +263,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -10901,7 +10445,7 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -429,7 +431,7 @@
+@@ -439,7 +443,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10910,7 +10454,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -467,9 +469,9 @@
+@@ -477,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10922,15 +10466,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
---- kjsembed/cpptests/Makefile.in
-+++ kjsembed/cpptests/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -200,6 +200,9 @@
+--- kjsembed/builtins/Makefile.in
++++ kjsembed/builtins/Makefile.in
+@@ -225,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10940,7 +10478,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -231,6 +234,7 @@
+@@ -256,6 +259,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -10948,16 +10486,16 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -386,7 +390,7 @@
- all: docs-am all-recursive
+@@ -427,7 +431,7 @@
.SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -424,9 +428,9 @@
+@@ -465,9 +469,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10968,25 +10506,10 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- mostlyclean-libtool:
+ clean-noinstLTLIBRARIES:
--- kjsembed/cpptests/jsaccess/Makefile.in
+++ kjsembed/cpptests/jsaccess/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
- # -*- makefile -*-
-
--SOURCES = $(jsaccess_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -42,7 +40,7 @@
+@@ -40,7 +40,7 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
@@ -10995,7 +10518,7 @@
subdir = kjsembed/cpptests/jsaccess
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -53,9 +51,7 @@
+@@ -51,9 +51,7 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -11006,7 +10529,7 @@
am_jsaccess_OBJECTS = jsaccess.$(OBJEXT)
#>- jsaccess_OBJECTS = $(am_jsaccess_OBJECTS)
#>+ 1
-@@ -221,6 +217,9 @@
+@@ -219,6 +217,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11016,7 +10539,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -252,6 +251,7 @@
+@@ -250,6 +251,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -11024,7 +10547,7 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -416,7 +416,7 @@
+@@ -414,7 +416,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11033,7 +10556,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -454,34 +454,13 @@
+@@ -452,34 +454,13 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11072,7 +10595,7 @@
f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
echo " rm -f $$p $$f"; \
rm -f $$p $$f ; \
-@@ -608,9 +587,6 @@
+@@ -606,9 +587,6 @@
check: check-am
all-am: Makefile $(PROGRAMS)
installdirs:
@@ -11082,7 +10605,7 @@
install: install-am
install-exec: install-exec-am
install-data: install-data-am
-@@ -639,9 +615,11 @@
+@@ -637,9 +615,11 @@
#>+ 1
clean: kde-rpo-clean clean-am
@@ -11097,7 +10620,7 @@
distclean: distclean-am
-rm -rf ./$(DEPDIR)
-@@ -661,7 +639,7 @@
+@@ -659,7 +639,7 @@
install-data-am:
@@ -11106,7 +10629,7 @@
install-info: install-info-am
-@@ -687,19 +665,19 @@
+@@ -685,19 +665,19 @@
ps-am:
@@ -11133,15 +10656,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
---- kjsembed/docs/Makefile.in
-+++ kjsembed/docs/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -201,6 +201,9 @@
+--- kjsembed/cpptests/Makefile.in
++++ kjsembed/cpptests/Makefile.in
+@@ -200,6 +200,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11151,7 +10668,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -232,6 +235,7 @@
+@@ -231,6 +234,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -11159,7 +10676,7 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -387,7 +391,7 @@
+@@ -386,7 +390,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -11168,7 +10685,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -425,9 +429,9 @@
+@@ -424,9 +428,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11182,12 +10699,6 @@
mostlyclean-libtool:
--- kjsembed/docs/embedding/Makefile.in
+++ kjsembed/docs/embedding/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -200,6 +200,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -11229,22 +10740,7 @@
mostlyclean-libtool:
--- kjsembed/docs/embedding/simple-embed/Makefile.in
+++ kjsembed/docs/embedding/simple-embed/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(embedjs_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -238,6 +236,9 @@
+@@ -236,6 +236,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11254,7 +10750,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -269,6 +270,7 @@
+@@ -267,6 +270,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -11262,7 +10758,7 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -456,7 +458,7 @@
+@@ -454,7 +458,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11271,7 +10767,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -494,9 +496,9 @@
+@@ -492,9 +496,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11283,24 +10779,50 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
---- kjsembed/kscript/Makefile.in
-+++ kjsembed/kscript/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
+--- kjsembed/docs/Makefile.in
++++ kjsembed/docs/Makefile.in
+@@ -201,6 +201,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -232,6 +235,7 @@
+ RUBY_ARCHDIR = @RUBY_ARCHDIR@
+ RUBY_LIBDIR = @RUBY_LIBDIR@
+ RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
++RUBY_RUBYLIBDIR = @RUBY_RUBYLIBDIR@
+ RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
+ RUBY_SITEDIR = @RUBY_SITEDIR@
+ SET_MAKE = @SET_MAKE@
+@@ -387,7 +391,7 @@
+ all: docs-am all-recursive
-@@ -17,8 +17,6 @@
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -425,9 +429,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--SOURCES = $(libjavascript_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -233,6 +231,9 @@
+ mostlyclean-libtool:
+--- kjsembed/kscript/Makefile.in
++++ kjsembed/kscript/Makefile.in
+@@ -231,6 +231,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11310,7 +10832,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -264,6 +265,7 @@
+@@ -262,6 +265,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -11318,7 +10840,7 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -432,7 +434,7 @@
+@@ -430,7 +434,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11327,7 +10849,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -470,9 +472,9 @@
+@@ -468,9 +472,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11339,24 +10861,50 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kjsembed/plugin/Makefile.in
-+++ kjsembed/plugin/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
+--- kjsembed/Makefile.in
++++ kjsembed/Makefile.in
+@@ -285,6 +285,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -316,6 +319,7 @@
+ RUBY_ARCHDIR = @RUBY_ARCHDIR@
+ RUBY_LIBDIR = @RUBY_LIBDIR@
+ RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
++RUBY_RUBYLIBDIR = @RUBY_RUBYLIBDIR@
+ RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
+ RUBY_SITEDIR = @RUBY_SITEDIR@
+ SET_MAKE = @SET_MAKE@
+@@ -535,7 +539,7 @@
-@@ -17,8 +17,6 @@
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -573,9 +577,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- # -*- makefile -*-
-
--SOURCES = $(libjsconsoleplugin_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -228,6 +226,9 @@
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- kjsembed/plugin/Makefile.in
++++ kjsembed/plugin/Makefile.in
+@@ -226,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11366,7 +10914,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -259,6 +260,7 @@
+@@ -257,6 +260,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -11374,7 +10922,7 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -424,7 +426,7 @@
+@@ -422,7 +426,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11383,7 +10931,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -462,9 +464,9 @@
+@@ -460,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11397,22 +10945,7 @@
@$(NORMAL_INSTALL)
--- kjsembed/plugins/Makefile.in
+++ kjsembed/plugins/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libcustomobjectplugin_la_SOURCES) $(libcustomqobjectplugin_la_SOURCES) $(libfileitemplugin_la_SOURCES) $(libimagefxplugin_la_SOURCES) $(libqprocessplugin_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -60,7 +58,7 @@
+@@ -58,7 +58,7 @@
am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
"$(DESTDIR)$(plugindesktopdir)"
kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
@@ -11421,7 +10954,7 @@
am__DEPENDENCIES_1 =
libcustomobjectplugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-@@ -128,7 +126,7 @@
+@@ -126,7 +126,7 @@
$(libfileitemplugin_la_SOURCES) $(libimagefxplugin_la_SOURCES) \
$(libqprocessplugin_la_SOURCES)
plugindesktopDATA_INSTALL = $(INSTALL_DATA)
@@ -11430,7 +10963,7 @@
ETAGS = etags
CTAGS = ctags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -266,6 +264,9 @@
+@@ -264,6 +264,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11440,7 +10973,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -297,6 +298,7 @@
+@@ -295,6 +298,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -11448,7 +10981,7 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -448,9 +450,8 @@
+@@ -446,9 +450,8 @@
xparts_SUBDIR_included_TRUE = @xparts_SUBDIR_included_TRUE@
INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes)
KDE_CXXFLAGS = -DQT_NO_ASCII_CAST -DQT_CLEAN_NAMESPACE
@@ -11460,7 +10993,7 @@
#>- METASOURCES = AUTO
# the Plugin's source, library search path, and link libraries
-@@ -480,16 +481,15 @@
+@@ -478,16 +481,15 @@
# this is where the desktop file will go
plugindesktopdir = $(kde_servicesdir)
@@ -11480,7 +11013,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -527,9 +527,9 @@
+@@ -525,9 +527,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11492,7 +11025,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -558,16 +558,25 @@
+@@ -556,16 +558,25 @@
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
@@ -11520,7 +11053,7 @@
#>- libfileitemplugin.la: $(libfileitemplugin_la_OBJECTS) $(libfileitemplugin_la_DEPENDENCIES)
#>+ 2
@KDE_USE_CLOSURE_TRUE at libfileitemplugin.la: libfileitemplugin.la.closure $(libfileitemplugin_la_OBJECTS) $(libfileitemplugin_la_DEPENDENCIES)
-@@ -755,10 +764,10 @@
+@@ -753,10 +764,10 @@
clean: kde-rpo-clean clean-am
#>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
@@ -11533,7 +11066,7 @@
distclean: distclean-am
-rm -rf ./$(DEPDIR)
-@@ -814,14 +823,14 @@
+@@ -812,14 +823,14 @@
uninstall-plugindesktopDATA
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
@@ -11558,22 +11091,7 @@
tags uninstall uninstall-am uninstall-info-am \
--- kjsembed/qtbindings/Makefile.in
+++ kjsembed/qtbindings/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libkjsembedqtbindings_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -238,6 +236,9 @@
+@@ -236,6 +236,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11583,7 +11101,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -269,6 +270,7 @@
+@@ -267,6 +270,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -11591,7 +11109,7 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -453,7 +455,7 @@
+@@ -451,7 +455,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11600,7 +11118,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -491,9 +493,9 @@
+@@ -489,9 +493,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11614,12 +11132,6 @@
clean-noinstLTLIBRARIES:
--- kjsembed/stdlib/Makefile.in
+++ kjsembed/stdlib/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -50,17 +50,11 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
@@ -11771,14 +11283,49 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
+--- korundum/bin/Makefile.in
++++ korundum/bin/Makefile.in
+@@ -220,6 +220,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -251,6 +254,7 @@
+ RUBY_ARCHDIR = @RUBY_ARCHDIR@
+ RUBY_LIBDIR = @RUBY_LIBDIR@
+ RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
++RUBY_RUBYLIBDIR = @RUBY_RUBYLIBDIR@
+ RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
+ RUBY_SITEDIR = @RUBY_SITEDIR@
+ SET_MAKE = @SET_MAKE@
+@@ -411,7 +415,7 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -449,9 +453,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
--- korundum/Makefile.in
+++ korundum/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -201,6 +201,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -11818,24 +11365,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- korundum/bin/Makefile.in
-+++ korundum/bin/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(krubyinit_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -222,6 +220,9 @@
+--- korundum/rubylib/korundum/lib/KDE/Makefile.in
++++ korundum/rubylib/korundum/lib/KDE/Makefile.in
+@@ -196,6 +196,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11845,7 +11377,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -253,6 +254,7 @@
+@@ -227,6 +230,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -11853,16 +11385,27 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -413,7 +415,7 @@
+@@ -376,16 +380,16 @@
+ xdg_menudir = @xdg_menudir@
+ xparts_SUBDIR_included_FALSE = @xparts_SUBDIR_included_FALSE@
+ xparts_SUBDIR_included_TRUE = @xparts_SUBDIR_included_TRUE@
+-kderubylibdir = $(RUBY_SITEDIR)/KDE
++kderubylibdir = $(RUBY_RUBYLIBDIR)/KDE
+ kderubylib_DATA = korundum.rb
+-rubylibdir = $(RUBY_SITEDIR)
++rubylibdir = $(RUBY_RUBYLIBDIR)
+ rubylib_DATA = Korundum.rb
+ #>- all: all-am
+ #>+ 1
+ all: docs-am all-am
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -451,9 +453,9 @@
+@@ -423,9 +427,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11872,16 +11415,10 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
- @$(NORMAL_INSTALL)
---- korundum/rubylib/Makefile.in
-+++ korundum/rubylib/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
+ mostlyclean-libtool:
+--- korundum/rubylib/korundum/lib/Makefile.in
++++ korundum/rubylib/korundum/lib/Makefile.in
@@ -200,6 +200,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -11923,22 +11460,7 @@
mostlyclean-libtool:
--- korundum/rubylib/korundum/Makefile.in
+++ korundum/rubylib/korundum/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(korundum_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -242,6 +240,9 @@
+@@ -240,6 +240,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11948,7 +11470,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -273,6 +274,7 @@
+@@ -271,6 +274,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -11956,7 +11478,7 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -423,7 +425,7 @@
+@@ -421,7 +425,7 @@
xparts_SUBDIR_included_FALSE = @xparts_SUBDIR_included_FALSE@
xparts_SUBDIR_included_TRUE = @xparts_SUBDIR_included_TRUE@
INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR)
@@ -11965,7 +11487,7 @@
rubylib_LTLIBRARIES = korundum.la
korundum_la_LDFLAGS = -module $(all_libraries) -version-info 0:0:0 -L$(top_srcdir)/smoke/kde/
#>- korundum_la_METASOURCES = AUTO
-@@ -436,7 +438,7 @@
+@@ -434,7 +438,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11974,7 +11496,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -474,9 +476,9 @@
+@@ -472,9 +476,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11986,15 +11508,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-rubylibLTLIBRARIES: $(rubylib_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- korundum/rubylib/korundum/lib/KDE/Makefile.in
-+++ korundum/rubylib/korundum/lib/KDE/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -196,6 +196,9 @@
+--- korundum/rubylib/Makefile.in
++++ korundum/rubylib/Makefile.in
+@@ -200,6 +200,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12004,7 +11520,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -227,6 +230,7 @@
+@@ -231,6 +234,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -12012,19 +11528,8 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -376,16 +380,16 @@
- xdg_menudir = @xdg_menudir@
- xparts_SUBDIR_included_FALSE = @xparts_SUBDIR_included_FALSE@
- xparts_SUBDIR_included_TRUE = @xparts_SUBDIR_included_TRUE@
--kderubylibdir = $(RUBY_SITEDIR)/KDE
-+kderubylibdir = $(RUBY_RUBYLIBDIR)/KDE
- kderubylib_DATA = korundum.rb
--rubylibdir = $(RUBY_SITEDIR)
-+rubylibdir = $(RUBY_RUBYLIBDIR)
- rubylib_DATA = Korundum.rb
- #>- all: all-am
- #>+ 1
- all: docs-am all-am
+@@ -386,7 +390,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -12032,7 +11537,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -423,9 +427,9 @@
+@@ -424,9 +428,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12044,15 +11549,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- korundum/rubylib/korundum/lib/Makefile.in
-+++ korundum/rubylib/korundum/lib/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -200,6 +200,9 @@
+--- korundum/rubylib/rbkconfig_compiler/Makefile.in
++++ korundum/rubylib/rbkconfig_compiler/Makefile.in
+@@ -232,6 +232,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12062,7 +11561,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -231,6 +234,7 @@
+@@ -263,6 +266,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -12070,16 +11569,16 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -386,7 +390,7 @@
- all: docs-am all-recursive
+@@ -426,7 +430,7 @@
.SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -424,9 +428,9 @@
+@@ -464,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12089,26 +11588,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
---- korundum/rubylib/rbkconfig_compiler/Makefile.in
-+++ korundum/rubylib/rbkconfig_compiler/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(rbkconfig_compiler_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -234,6 +232,9 @@
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+--- korundum/rubylib/rbkconfig_compiler/tests/Makefile.in
++++ korundum/rubylib/rbkconfig_compiler/tests/Makefile.in
+@@ -222,6 +222,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12118,7 +11602,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -265,6 +266,7 @@
+@@ -253,6 +256,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -12126,16 +11610,16 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -428,7 +430,7 @@
+@@ -419,7 +423,7 @@
+ all: docs-am all-am
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -466,9 +468,9 @@
+@@ -457,9 +461,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12145,26 +11629,73 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
- @$(NORMAL_INSTALL)
---- korundum/rubylib/rbkconfig_compiler/tests/Makefile.in
-+++ korundum/rubylib/rbkconfig_compiler/tests/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-@@ -14,8 +14,6 @@
- # PARTICULAR PURPOSE.
+ clean-checkPROGRAMS:
+--- Makefile.in
++++ Makefile.in
+@@ -230,6 +230,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -261,6 +264,7 @@
+ RUBY_ARCHDIR = @RUBY_ARCHDIR@
+ RUBY_LIBDIR = @RUBY_LIBDIR@
+ RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
++RUBY_RUBYLIBDIR = @RUBY_RUBYLIBDIR@
+ RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
+ RUBY_SITEDIR = @RUBY_SITEDIR@
+ SET_MAKE = @SET_MAKE@
+@@ -421,7 +425,7 @@
+ .SUFFIXES:
+ am--refresh:
+ @:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -463,12 +467,12 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ $(SHELL) ./config.status --recheck
- @SET_MAKE@
--SOURCES = $(test1_SOURCES) $(test2_SOURCES) $(test3_SOURCES) $(test4_SOURCES) $(test5_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -224,6 +222,9 @@
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ #>- cd $(srcdir) && $(AUTOCONF)
+ #>+ 2
+ cd $(srcdir) && rm -f configure
+ cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+ config.h: stamp-h1
+@@ -480,7 +484,7 @@
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+ @rm -f stamp-h1
+ cd $(top_builddir) && $(SHELL) ./config.status config.h
+-$(srcdir)/config.h.in: $(am__configure_deps)
++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_srcdir) && $(AUTOHEADER)
+ rm -f stamp-h1
+ touch $@
+@@ -899,7 +903,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=subdirs Makefile.in configure.in.bot configure.files config.h.in Makefile.am.in.wo kdebindings.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am acinclude.m4 Makefile.am.in
++KDE_DIST=stamp-h.in subdirs Makefile.in configure.in.bot configure.files config.h.in Makefile.am.in.wo kdebindings.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in configure acinclude.m4 Makefile.am Makefile.am.in
+
+ #>+ 2
+ docs-am:
+--- python/Makefile.in
++++ python/Makefile.in
+@@ -190,6 +190,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12174,7 +11705,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -255,6 +256,7 @@
+@@ -221,6 +224,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -12182,7 +11713,7 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -421,7 +423,7 @@
+@@ -385,7 +389,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12191,7 +11722,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -459,9 +461,9 @@
+@@ -423,9 +427,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12202,16 +11733,10 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- clean-checkPROGRAMS:
---- python/Makefile.in
-+++ python/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -190,6 +190,9 @@
+ mostlyclean-libtool:
+--- qtjava/javalib/docs/en/Makefile.in
++++ qtjava/javalib/docs/en/Makefile.in
+@@ -186,6 +186,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12221,7 +11746,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -221,6 +224,7 @@
+@@ -217,6 +220,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -12229,7 +11754,7 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -385,7 +389,7 @@
+@@ -372,7 +376,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12238,7 +11763,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -423,9 +427,9 @@
+@@ -410,9 +414,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12250,15 +11775,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- qtjava/Makefile.in
-+++ qtjava/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -203,6 +203,9 @@
+--- qtjava/javalib/docs/Makefile.in
++++ qtjava/javalib/docs/Makefile.in
+@@ -202,6 +202,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12268,7 +11787,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -234,6 +237,7 @@
+@@ -233,6 +236,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -12276,7 +11795,7 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -390,7 +394,7 @@
+@@ -388,7 +392,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -12285,7 +11804,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -428,9 +432,9 @@
+@@ -426,9 +430,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12299,22 +11818,7 @@
mostlyclean-libtool:
--- qtjava/javalib/Makefile.in
+++ qtjava/javalib/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = qtjava/JavaSlot.cpp qtjava/QSyntaxHighlighter.cpp qtjava/QToolBox.cpp qtjava/QSplashScreen.cpp qtjava/QSpinWidget.cpp qtjava/QHttpResponseHeader.cpp qtjava/QHttpRequestHeader.cpp qtjava/QHttpHeader.cpp qtjava/QEventLoop.cpp qtjava/QGb18030Codec.cpp qtjava/QXmlSimpleReader.cpp qtjava/QXmlReader.cpp qtjava/QXmlParseException.cpp qtjava/QXmlNamespaceSupport.cpp qtjava/QXmlLocator.cpp qtjava/QXmlLexicalHandler.cpp qtjava/QXmlInputSource.cpp qtjava/QXmlErrorHandler.cpp qtjava/QXmlEntityResolver.cpp qtjava/QXmlDTDHandler.cpp qtjava/QXmlDefaultHandler.cpp qtjava/QXmlDeclHandler.cpp qtjava/QXmlContentHandler.cpp qtjava/QXmlAttributes.cpp qtjava/QWorkspace.cpp qtjava/QWMatrix.cpp qtjava/QWizard.cpp qtjava/QWidgetStack.cpp qtjava/QWidgetItem.cpp qtjava/QWidget.cpp qtjava/QWheelEvent.cpp qtjava/QWhatsThis.cpp qtjava/QVGroupBox.cpp qtjava/QVButtonGroup.cpp qtjava/QVBoxLayout.cpp qtjava/QVBox.cpp qtjava/QVariant.cpp qtjava/QValidator.cpp qtjava/QUuid.cpp qtjava/QUtf8Codec.cpp qtjava/QUtf16Codec.cpp qtjava/QUrlOperator.cpp qtjava/QUrlInfo.cpp qtjava/QUrl.cpp qtjava/QUriDrag.cpp qtjava/QtSupport.cpp qtjava/QTsciiCodec.cpp qtjava/QTranslatorMessage.cpp qtjava/QTranslator.cpp qtjava/QToolTipGroup.cpp qtjava/QToolTip.cpp qtjava/QToolButton.cpp qtjava/QToolBar.cpp qtjava/qtjava.cpp qtjava/QTimerEvent.cpp qtjava/QTimer.cpp qtjava/QTimeEdit.cpp qtjava/QTextView.cpp qtjava/QTextStream.cpp qtjava/QTextOStream.cpp qtjava/QTextIStream.cpp qtjava/QTextEncoder.cpp qtjava/QTextEdit.cpp qtjava/QTextDrag.cpp qtjava/QTextDecoder.cpp qtjava/QTextCodec.cpp qtjava/QTextBrowser.cpp qtjava/QTabWidget.cpp qtjava/QTabletEvent.cpp qtjava/QTableSelection.cpp qtjava/QTableItem.cpp qtjava/QTable.cpp qtjava/QTabDialog.cpp qtjava/QTabBar.cpp qtjava/QTab.cpp qtjava/Qt.cpp qtjava/QStyleSheetItem.cpp qtjava/QStyleSheet.cpp qtjava/QStyleFactory.cpp qtjava/QStyle.cpp qtjava/QStoredDrag.cpp qtjava/QStatusBar.cpp qtjava/QSqlResult.cpp qtjava/QSqlRecord.cpp qtjava/QSqlQuery.cpp qtjava/QSqlPropertyMap.cpp qtjava/QSqlIndex.cpp qtjava/QSqlForm.cpp qtjava/QSqlField.cpp qtjava/QSqlError.cpp qtjava/QSqlEditorFactory.cpp qtjava/QSqlDriver.cpp qtjava/QSqlDatabase.cpp qtjava/QSqlCursor.cpp qtjava/QSql.cpp qtjava/QSplitter.cpp qtjava/QSpinBox.cpp qtjava/QSpacerItem.cpp qtjava/QSound.cpp qtjava/QSocketNotifier.cpp qtjava/QSocketDevice.cpp qtjava/QSocket.cpp qtjava/QSlider.cpp qtjava/QSjisCodec.cpp qtjava/QSizePolicy.cpp qtjava/QSizeGrip.cpp qtjava/QSize.cpp qtjava/QSimpleRichText.cpp qtjava/QSignalMapper.cpp qtjava/QSignal.cpp qtjava/QShowEvent.cpp qtjava/QSettings.cpp qtjava/QSessionManager.cpp qtjava/QServerSocket.cpp qtjava/QSemiModal.cpp qtjava/QScrollView.cpp qtjava/QScrollBar.cpp qtjava/QResizeEvent.cpp qtjava/QRegion.cpp qtjava/QRegExpValidator.cpp qtjava/QRegExp.cpp qtjava/QRect.cpp qtjava/QRangeControl.cpp qtjava/QRadioButton.cpp qtjava/QPushButton.cpp qtjava/QProgressDialog.cpp qtjava/QProgressBar.cpp qtjava/QProcess.cpp qtjava/QPrinter.cpp qtjava/QPrintDialog.cpp qtjava/QPopupMenu.cpp qtjava/QPolygonScanner.cpp qtjava/QPointArray.cpp qtjava/QPoint.cpp qtjava/QPixmap.cpp qtjava/QPicture.cpp qtjava/QPen.cpp qtjava/QPalette.cpp qtjava/QPaintEvent.cpp qtjava/QPainter.cpp qtjava/QPaintDeviceMetrics.cpp qtjava/QPaintDevice.cpp qtjava/QObjectCleanupHandler.cpp qtjava/QObject.cpp qtjava/QNetworkProtocol.cpp qtjava/QNetworkOperation.cpp qtjava/QMultiLineEdit.cpp qtjava/QMovie.cpp qtjava/QMoveEvent.cpp qtjava/QMouseEvent.cpp qtjava/QMimeSourceFactory.cpp qtjava/QMimeSource.cpp qtjava/QMetaProperty.cpp qtjava/QMetaObject.cpp qtjava/QMetaEnum.cpp qtjava/QMetaData.cpp qtjava/QMessageBox.cpp qtjava/QMenuItem.cpp qtjava/QMenuData.cpp qtjava/QMenuBar.cpp qtjava/QMainWindow.cpp qtjava/QLocalFs.cpp qtjava/QListViewItem.cpp qtjava/QListView.cpp qtjava/QListBoxText.cpp qtjava/QListBoxPixmap.cpp qtjava/QListBoxItem.cpp qtjava/QListBox.cpp qtjava/QLineEdit.cpp qtjava/QLibrary.cpp qtjava/QLCDNumber.cpp qtjava/QLayoutItem.cpp qtjava/QLayout.cpp qtjava/QLabel.cpp qtjava/QKeySequence.cpp qtjava/QKeyEvent.cpp qtjava/QJpUnicodeConv.cpp qtjava/QJisCodec.cpp qtjava/QIODeviceSource.cpp qtjava/QIODevice.cpp qtjava/QIntValidator.cpp qtjava/QInputDialog.cpp qtjava/QIMEvent.cpp qtjava/QImageTextKeyLang.cpp qtjava/QImageIO.cpp qtjava/QImageFormatType.cpp qtjava/QImageFormat.cpp qtjava/QImageDrag.cpp qtjava/QImageDecoder.cpp qtjava/QImageConsumer.cpp qtjava/QImage.cpp qtjava/QIconViewItem.cpp qtjava/QIconView.cpp qtjava/QIconSet.cpp qtjava/QIconDragItem.cpp qtjava/QIconDrag.cpp qtjava/QHttp.cpp qtjava/QHostAddress.cpp qtjava/QHideEvent.cpp qtjava/QHGroupBox.cpp qtjava/QHebrewCodec.cpp qtjava/QHeader.cpp qtjava/QHButtonGroup.cpp qtjava/QHBoxLayout.cpp qtjava/QHBox.cpp qtjava/QGroupBox.cpp qtjava/QGridView.cpp qtjava/QGridLayout.cpp qtjava/QGrid.cpp qtjava/QFtp.cpp qtjava/QFrame.cpp qtjava/QFontMetrics.cpp qtjava/QFontInfo.cpp qtjava/QFontDialog.cpp qtjava/QFontDatabase.cpp qtjava/QFont.cpp qtjava/QFocusEvent.cpp qtjava/QFocusData.cpp qtjava/QFilePreview.cpp qtjava/QFileInfo.cpp qtjava/QFileIconProvider.cpp qtjava/QFileDialog.cpp qtjava/QFile.cpp qtjava/QEvent.cpp qtjava/QEucKrCodec.cpp qtjava/QEucJpCodec.cpp qtjava/QErrorMessage.cpp qtjava/QEditorFactory.cpp qtjava/QDropSite.cpp qtjava/QDropEvent.cpp qtjava/QDragResponseEvent.cpp qtjava/QDragObject.cpp qtjava/QDragMoveEvent.cpp qtjava/QDragManager.cpp qtjava/QDragLeaveEvent.cpp qtjava/QDragEnterEvent.cpp qtjava/QDoubleValidator.cpp qtjava/QDomText.cpp qtjava/QDomProcessingInstruction.cpp qtjava/QDomNotation.cpp qtjava/QDomNode.cpp qtjava/QDomNamedNodeMap.cpp qtjava/QDomImplementation.cpp qtjava/QDomEntityReference.cpp qtjava/QDomEntity.cpp qtjava/QDomElement.cpp qtjava/QDomDocumentType.cpp qtjava/QDomDocumentFragment.cpp qtjava/QDomDocument.cpp qtjava/QDomComment.cpp qtjava/QDomCharacterData.cpp qtjava/QDomCDATASection.cpp qtjava/QDomAttr.cpp qtjava/QDockWindow.cpp qtjava/QDockArea.cpp qtjava/QDir.cpp qtjava/QDialog.cpp qtjava/QDial.cpp qtjava/QDesktopWidget.cpp qtjava/QDateTimeEditBase.cpp qtjava/QDateTimeEdit.cpp qtjava/QDateEdit.cpp qtjava/QDataView.cpp qtjava/QDataTable.cpp qtjava/QDataStream.cpp qtjava/QDataSource.cpp qtjava/QDataSink.cpp qtjava/QDataPump.cpp qtjava/QDataBrowser.cpp qtjava/QCustomMenuItem.cpp qtjava/QCustomEvent.cpp qtjava/QCursor.cpp qtjava/QContextMenuEvent.cpp qtjava/QComboTableItem.cpp qtjava/QComboBox.cpp qtjava/QColorGroup.cpp qtjava/QColorDrag.cpp qtjava/QColorDialog.cpp qtjava/QColor.cpp qtjava/QCloseEvent.cpp qtjava/QClipboard.cpp qtjava/QClassInfo.cpp qtjava/QChildEvent.cpp qtjava/QCheckTableItem.cpp qtjava/QCheckListItem.cpp qtjava/QCheckBox.cpp qtjava/QCanvasView.cpp qtjava/QCanvasText.cpp qtjava/QCanvasSprite.cpp qtjava/QCanvasSpline.cpp qtjava/QCanvasRectangle.cpp qtjava/QCanvasPolygonalItem.cpp qtjava/QCanvasPolygon.cpp qtjava/QCanvasPixmapArray.cpp qtjava/QCanvasPixmap.cpp qtjava/QCanvasLine.cpp qtjava/QCanvasItem.cpp qtjava/QCanvasEllipse.cpp qtjava/QCanvas.cpp qtjava/QButtonGroup.cpp qtjava/QButton.cpp qtjava/QBuffer.cpp qtjava/QBrush.cpp qtjava/QBoxLayout.cpp qtjava/QBitmap.cpp qtjava/QBig5Codec.cpp qtjava/QAuServer.cpp qtjava/QAsyncIO.cpp qtjava/QApplication.cpp qtjava/QActionGroup.cpp qtjava/QAction.cpp qtjava/QAccel.cpp main.cpp
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -41,7 +39,7 @@
+@@ -39,7 +39,7 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
@@ -12323,7 +11827,7 @@
subdir = qtjava/javalib
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -52,9 +50,7 @@
+@@ -50,9 +50,7 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -12334,7 +11838,7 @@
am_javalib_OBJECTS = main.$(OBJEXT)
#>- javalib_OBJECTS = $(am_javalib_OBJECTS)
#>+ 1
-@@ -102,6 +98,7 @@
+@@ -100,6 +98,7 @@
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
@@ -12342,7 +11846,7 @@
dataDATA_INSTALL = $(INSTALL_DATA)
DATA = $(data_DATA)
ETAGS = etags
-@@ -242,6 +239,9 @@
+@@ -240,6 +239,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12352,7 +11856,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -273,6 +273,7 @@
+@@ -271,6 +273,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -12360,7 +11864,7 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -589,7 +590,7 @@
+@@ -587,7 +590,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12369,7 +11873,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,34 +628,13 @@
+@@ -625,34 +628,13 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12392,7 +11896,7 @@
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
- else :; fi; \
- done
--
+
-uninstall-binPROGRAMS:
- @$(NORMAL_UNINSTALL)
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
@@ -12400,7 +11904,7 @@
- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
- rm -f "$(DESTDIR)$(bindir)/$$f"; \
- done
-
+-
-clean-binPROGRAMS:
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
+clean-noinstPROGRAMS:
@@ -12408,7 +11912,7 @@
f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
echo " rm -f $$p $$f"; \
rm -f $$p $$f ; \
-@@ -898,7 +878,7 @@
+@@ -896,7 +878,7 @@
all-am: Makefile $(PROGRAMS) $(DATA)
installdirs: installdirs-recursive
installdirs-am:
@@ -12417,7 +11921,7 @@
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-recursive
-@@ -930,9 +910,11 @@
+@@ -928,9 +910,11 @@
#>+ 1
clean: kde-rpo-clean clean-recursive
@@ -12432,7 +11936,7 @@
distclean: distclean-recursive
-rm -rf ./$(DEPDIR)
-@@ -952,7 +934,7 @@
+@@ -950,7 +934,7 @@
install-data-am: install-dataDATA
@@ -12441,7 +11945,7 @@
install-info: install-info-recursive
-@@ -978,25 +960,24 @@
+@@ -976,25 +960,24 @@
ps-am:
@@ -12475,15 +11979,9 @@
qtjava.jar: org/kde/qt/classnoinst.stamp
---- qtjava/javalib/docs/Makefile.in
-+++ qtjava/javalib/docs/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -202,6 +202,9 @@
+--- qtjava/javalib/org/kde/Makefile.in
++++ qtjava/javalib/org/kde/Makefile.in
+@@ -200,6 +200,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12493,7 +11991,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -233,6 +236,7 @@
+@@ -231,6 +234,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -12501,7 +11999,7 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -388,7 +392,7 @@
+@@ -386,7 +390,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -12510,7 +12008,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -426,9 +430,9 @@
+@@ -424,9 +428,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12522,15 +12020,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- qtjava/javalib/docs/en/Makefile.in
-+++ qtjava/javalib/docs/en/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -186,6 +186,9 @@
+--- qtjava/javalib/org/kde/qt/Makefile.in
++++ qtjava/javalib/org/kde/qt/Makefile.in
+@@ -188,6 +188,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12540,7 +12032,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -217,6 +220,7 @@
+@@ -219,6 +222,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -12548,7 +12040,15 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -372,7 +376,7 @@
+@@ -511,14 +515,14 @@
+ noinst_JAVA = $(EXTRA_DIST)
+ #install-data-hook: uninstall-javaJAVA
+ JAVAROOT = ../../..
+-CLASSPATH = $(srcdir)/../../..
++CLASSPATH = ../../..
+ JAVACFLAGS = -classpath $(CLASSPATH)
+ #>- all: all-am
+ #>+ 1
all: docs-am all-am
.SUFFIXES:
@@ -12557,7 +12057,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -410,9 +414,9 @@
+@@ -556,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12571,12 +12071,6 @@
mostlyclean-libtool:
--- qtjava/javalib/org/Makefile.in
+++ qtjava/javalib/org/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -200,6 +200,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -12616,126 +12110,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- qtjava/javalib/org/kde/Makefile.in
-+++ qtjava/javalib/org/kde/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -200,6 +200,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -231,6 +234,7 @@
- RUBY_ARCHDIR = @RUBY_ARCHDIR@
- RUBY_LIBDIR = @RUBY_LIBDIR@
- RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
-+RUBY_RUBYLIBDIR = @RUBY_RUBYLIBDIR@
- RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
- RUBY_SITEDIR = @RUBY_SITEDIR@
- SET_MAKE = @SET_MAKE@
-@@ -386,7 +390,7 @@
- all: docs-am all-recursive
-
- .SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -424,9 +428,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
---- qtjava/javalib/org/kde/qt/Makefile.in
-+++ qtjava/javalib/org/kde/qt/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -188,6 +188,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -219,6 +222,7 @@
- RUBY_ARCHDIR = @RUBY_ARCHDIR@
- RUBY_LIBDIR = @RUBY_LIBDIR@
- RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
-+RUBY_RUBYLIBDIR = @RUBY_RUBYLIBDIR@
- RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
- RUBY_SITEDIR = @RUBY_SITEDIR@
- SET_MAKE = @SET_MAKE@
-@@ -511,14 +515,14 @@
- noinst_JAVA = $(EXTRA_DIST)
- #install-data-hook: uninstall-javaJAVA
- JAVAROOT = ../../..
--CLASSPATH = $(srcdir)/../../..
-+CLASSPATH = ../../..
- JAVACFLAGS = -classpath $(CLASSPATH)
- #>- all: all-am
- #>+ 1
- all: docs-am all-am
-
- .SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -556,9 +560,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
--- qtjava/javalib/qtjava/Makefile.in
+++ qtjava/javalib/qtjava/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libqtjava_la_SOURCES) $(libqtjavasupport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -58,9 +56,10 @@
+@@ -56,9 +56,10 @@
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
@@ -12748,7 +12125,7 @@
am__DEPENDENCIES_1 =
libqtjava_la_DEPENDENCIES = $(am__DEPENDENCIES_1) libqtjavasupport.la
am_libqtjava_la_OBJECTS = QSyntaxHighlighter.lo QToolBox.lo \
-@@ -405,6 +404,9 @@
+@@ -403,6 +404,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12758,7 +12135,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -436,6 +438,7 @@
+@@ -434,6 +438,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -12766,7 +12143,7 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -587,7 +590,9 @@
+@@ -585,7 +590,9 @@
xparts_SUBDIR_included_TRUE = @xparts_SUBDIR_included_TRUE@
####### kdevelop will overwrite this part!!! (begin)##########
@@ -12777,7 +12154,7 @@
AM_LDFLAGS =
libqtjava_la_SOURCES = QSyntaxHighlighter.cpp QToolBox.cpp \
QSplashScreen.cpp QSpinWidget.cpp QHttpResponseHeader.cpp \
-@@ -876,7 +881,7 @@
+@@ -874,7 +881,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12786,7 +12163,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -914,10 +919,37 @@
+@@ -912,10 +919,37 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12826,7 +12203,7 @@
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-@@ -949,7 +981,7 @@
+@@ -947,7 +981,7 @@
#>+ 2
@KDE_USE_CLOSURE_TRUE at libqtjava.la: libqtjava.la.closure $(libqtjava_la_OBJECTS) $(libqtjava_la_DEPENDENCIES)
@KDE_USE_CLOSURE_FALSE at libqtjava.la: $(libqtjava_la_OBJECTS) $(libqtjava_la_DEPENDENCIES)
@@ -12835,7 +12212,7 @@
#>- libqtjavasupport.la: $(libqtjavasupport_la_OBJECTS) $(libqtjavasupport_la_DEPENDENCIES)
#>+ 2
@KDE_USE_CLOSURE_TRUE at libqtjavasupport.la: libqtjavasupport.la.closure $(libqtjavasupport_la_OBJECTS) $(libqtjavasupport_la_DEPENDENCIES)
-@@ -1387,7 +1419,7 @@
+@@ -1385,7 +1419,7 @@
check: check-am
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
installdirs:
@@ -12844,7 +12221,7 @@
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
-@@ -1418,11 +1450,11 @@
+@@ -1416,11 +1450,11 @@
#>+ 1
clean: kde-rpo-clean clean-am
@@ -12860,7 +12237,7 @@
distclean: distclean-am
-rm -rf ./$(DEPDIR)
-@@ -1440,7 +1472,7 @@
+@@ -1438,7 +1472,7 @@
info-am:
@@ -12869,7 +12246,7 @@
install-exec-am: install-libLTLIBRARIES
-@@ -1468,20 +1500,22 @@
+@@ -1466,20 +1500,22 @@
ps-am:
@@ -12899,15 +12276,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
---- qtruby/Makefile.in
-+++ qtruby/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -201,6 +201,9 @@
+--- qtjava/Makefile.in
++++ qtjava/Makefile.in
+@@ -203,6 +203,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12917,7 +12288,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -232,6 +235,7 @@
+@@ -234,6 +237,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -12925,7 +12296,7 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -388,7 +392,7 @@
+@@ -390,7 +394,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -12934,7 +12305,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -426,9 +430,9 @@
+@@ -428,9 +432,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12948,22 +12319,7 @@
mostlyclean-libtool:
--- qtruby/bin/Makefile.in
+++ qtruby/bin/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(qtrubyinit_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -225,6 +223,9 @@
+@@ -223,6 +223,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12973,7 +12329,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -256,6 +257,7 @@
+@@ -254,6 +257,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -12981,7 +12337,7 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -417,7 +419,7 @@
+@@ -415,7 +419,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12990,7 +12346,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -455,9 +457,9 @@
+@@ -453,9 +457,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13002,15 +12358,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
---- qtruby/rubylib/Makefile.in
-+++ qtruby/rubylib/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -200,6 +200,9 @@
+--- qtruby/Makefile.in
++++ qtruby/Makefile.in
+@@ -201,6 +201,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13020,7 +12370,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -231,6 +234,7 @@
+@@ -232,6 +235,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -13028,7 +12378,7 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -386,7 +390,7 @@
+@@ -388,7 +392,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -13037,7 +12387,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -424,9 +428,9 @@
+@@ -426,9 +430,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13051,12 +12401,6 @@
mostlyclean-libtool:
--- qtruby/rubylib/designer/Makefile.in
+++ qtruby/rubylib/designer/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -200,6 +200,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -13098,22 +12442,7 @@
mostlyclean-libtool:
--- qtruby/rubylib/designer/rbuic/Makefile.in
+++ qtruby/rubylib/designer/rbuic/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(librbuic_la_SOURCES) $(rbuic_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -232,6 +230,9 @@
+@@ -230,6 +230,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13123,7 +12452,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -263,6 +264,7 @@
+@@ -261,6 +264,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -13131,7 +12460,7 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -429,7 +431,7 @@
+@@ -427,7 +431,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13140,7 +12469,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -467,9 +469,9 @@
+@@ -465,9 +469,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13154,22 +12483,7 @@
clean-noinstLTLIBRARIES:
--- qtruby/rubylib/designer/uilib/Makefile.in
+++ qtruby/rubylib/designer/uilib/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(qui_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -224,6 +222,9 @@
+@@ -222,6 +222,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13179,7 +12493,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -255,6 +256,7 @@
+@@ -253,6 +256,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -13187,7 +12501,7 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -405,7 +407,7 @@
+@@ -403,7 +407,7 @@
xparts_SUBDIR_included_FALSE = @xparts_SUBDIR_included_FALSE@
xparts_SUBDIR_included_TRUE = @xparts_SUBDIR_included_TRUE@
INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR)
@@ -13196,7 +12510,7 @@
rubylib_LTLIBRARIES = qui.la
qui_la_SOURCES = qui.cpp
qui_la_LDFLAGS = -module -export-dynamic $(all_libraries) -version-info 0:0:0
-@@ -416,7 +418,7 @@
+@@ -414,7 +418,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13205,7 +12519,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -454,9 +456,9 @@
+@@ -452,9 +456,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13217,24 +12531,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-rubylibLTLIBRARIES: $(rubylib_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- qtruby/rubylib/qtruby/Makefile.in
-+++ qtruby/rubylib/qtruby/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libqtrubyinternal_la_SOURCES) $(qtruby_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -259,6 +257,9 @@
+--- qtruby/rubylib/Makefile.in
++++ qtruby/rubylib/Makefile.in
+@@ -200,6 +200,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13244,7 +12543,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -290,6 +291,7 @@
+@@ -231,6 +234,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -13252,25 +12551,16 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -444,7 +446,7 @@
- noinst_LTLIBRARIES = libqtrubyinternal.la
- libqtrubyinternal_la_SOURCES = Qt.cpp handlers.cpp
- #>- libqtrubyinternal_la_METASOURCES = AUTO
--rubylibdir = $(RUBY_SITEARCHDIR)
-+rubylibdir = $(RUBY_ARCHDIR)
- rubylib_LTLIBRARIES = qtruby.la
- qtruby_la_SOURCES =
- qtruby_la_LDFLAGS = -module $(all_libraries) -version-info 0:0:0 -L$(top_srcdir)/smoke/qt/
-@@ -456,7 +458,7 @@
+@@ -386,7 +390,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -494,9 +496,9 @@
+@@ -424,9 +428,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13281,15 +12571,9 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- clean-noinstLTLIBRARIES:
+ mostlyclean-libtool:
--- qtruby/rubylib/qtruby/lib/Makefile.in
+++ qtruby/rubylib/qtruby/lib/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -210,6 +210,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -13339,12 +12623,6 @@
mostlyclean-libtool:
--- qtruby/rubylib/qtruby/lib/Qt/Makefile.in
+++ qtruby/rubylib/qtruby/lib/Qt/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -194,6 +194,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -13392,15 +12670,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- qtsharp/Makefile.in
-+++ qtsharp/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -201,6 +201,9 @@
+--- qtruby/rubylib/qtruby/Makefile.in
++++ qtruby/rubylib/qtruby/Makefile.in
+@@ -257,6 +257,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13410,7 +12682,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -232,6 +235,7 @@
+@@ -288,6 +291,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -13418,16 +12690,25 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -388,7 +392,7 @@
- all: docs-am all-recursive
+@@ -442,7 +446,7 @@
+ noinst_LTLIBRARIES = libqtrubyinternal.la
+ libqtrubyinternal_la_SOURCES = Qt.cpp handlers.cpp
+ #>- libqtrubyinternal_la_METASOURCES = AUTO
+-rubylibdir = $(RUBY_SITEARCHDIR)
++rubylibdir = $(RUBY_ARCHDIR)
+ rubylib_LTLIBRARIES = qtruby.la
+ qtruby_la_SOURCES =
+ qtruby_la_LDFLAGS = -module $(all_libraries) -version-info 0:0:0
+@@ -454,7 +458,7 @@
.SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -426,9 +430,9 @@
+@@ -492,9 +496,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13438,16 +12719,10 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- mostlyclean-libtool:
---- qtsharp/src/Makefile.in
-+++ qtsharp/src/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -200,6 +200,9 @@
+ clean-noinstLTLIBRARIES:
+--- qtsharp/Makefile.in
++++ qtsharp/Makefile.in
+@@ -201,6 +201,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13457,7 +12732,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -231,6 +234,7 @@
+@@ -232,6 +235,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -13465,7 +12740,7 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -386,7 +390,7 @@
+@@ -388,7 +392,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -13474,7 +12749,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -424,9 +428,9 @@
+@@ -426,9 +430,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13488,12 +12763,6 @@
mostlyclean-libtool:
--- qtsharp/src/bindings/Makefile.in
+++ qtsharp/src/bindings/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -184,6 +184,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -13535,12 +12804,6 @@
mostlyclean-libtool:
--- qtsharp/src/examples/Makefile.in
+++ qtsharp/src/examples/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -200,6 +200,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -13582,12 +12845,6 @@
mostlyclean-libtool:
--- qtsharp/src/examples/samples/Makefile.in
+++ qtsharp/src/examples/samples/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -184,6 +184,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -13629,12 +12886,6 @@
mostlyclean-libtool:
--- qtsharp/src/examples/tutorials/Makefile.in
+++ qtsharp/src/examples/tutorials/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -184,6 +184,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -13676,12 +12927,6 @@
mostlyclean-libtool:
--- qtsharp/src/generator/Makefile.in
+++ qtsharp/src/generator/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -184,6 +184,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -13723,22 +12968,7 @@
mostlyclean-libtool:
--- qtsharp/src/libqtsharp/Makefile.in
+++ qtsharp/src/libqtsharp/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libqtsharp_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -227,6 +225,9 @@
+@@ -225,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13748,7 +12978,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -258,6 +259,7 @@
+@@ -256,6 +259,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -13756,7 +12986,7 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -421,7 +423,7 @@
+@@ -419,7 +423,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13765,7 +12995,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -459,9 +461,9 @@
+@@ -457,9 +461,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13777,14 +13007,49 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+--- qtsharp/src/Makefile.in
++++ qtsharp/src/Makefile.in
+@@ -200,6 +200,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -231,6 +234,7 @@
+ RUBY_ARCHDIR = @RUBY_ARCHDIR@
+ RUBY_LIBDIR = @RUBY_LIBDIR@
+ RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
++RUBY_RUBYLIBDIR = @RUBY_RUBYLIBDIR@
+ RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
+ RUBY_SITEDIR = @RUBY_SITEDIR@
+ SET_MAKE = @SET_MAKE@
+@@ -386,7 +390,7 @@
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -424,9 +428,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
--- qtsharp/src/tests/Makefile.in
+++ qtsharp/src/tests/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -184,6 +184,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -13826,12 +13091,6 @@
mostlyclean-libtool:
--- qtsharp/src/uicsharp/Makefile.in
+++ qtsharp/src/uicsharp/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -184,6 +184,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -13871,15 +13130,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- smoke/Makefile.in
-+++ smoke/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -211,6 +211,9 @@
+--- smoke/kde/Makefile.in
++++ smoke/kde/Makefile.in
+@@ -230,6 +230,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13889,7 +13142,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -242,6 +245,7 @@
+@@ -261,6 +264,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -13897,16 +13150,16 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -398,7 +402,7 @@
- all: docs-am all-recursive
+@@ -437,7 +441,7 @@
.SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -436,9 +440,9 @@
+@@ -475,9 +479,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13916,26 +13169,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
---- smoke/kde/Makefile.in
-+++ smoke/kde/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libsmokekde_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -232,6 +230,9 @@
+ qtguess.pl: $(top_builddir)/config.status $(srcdir)/qtguess.pl.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+--- smoke/Makefile.in
++++ smoke/Makefile.in
+@@ -211,6 +211,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13945,7 +13183,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -263,6 +264,7 @@
+@@ -242,6 +245,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -13953,16 +13191,16 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -439,7 +441,7 @@
+@@ -398,7 +402,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -477,9 +479,9 @@
+@@ -436,9 +440,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13972,26 +13210,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- qtguess.pl: $(top_builddir)/config.status $(srcdir)/qtguess.pl.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+ mostlyclean-libtool:
--- smoke/qt/Makefile.in
+++ smoke/qt/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libsmokeqt_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -230,6 +228,9 @@
+@@ -228,6 +228,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14001,7 +13224,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -261,6 +262,7 @@
+@@ -259,6 +262,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -14009,7 +13232,7 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -437,7 +439,7 @@
+@@ -435,7 +439,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14018,7 +13241,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -475,9 +477,9 @@
+@@ -473,9 +477,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14032,12 +13255,6 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
--- xparts/Makefile.in
+++ xparts/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -201,6 +201,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -14079,22 +13296,7 @@
mostlyclean-libtool:
--- xparts/mozilla/Makefile.in
+++ xparts/mozilla/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(libkmozillapart_la_SOURCES) $(kmozilla_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -252,6 +250,9 @@
+@@ -250,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14104,7 +13306,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -283,6 +284,7 @@
+@@ -281,6 +284,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -14112,7 +13314,7 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -454,7 +456,7 @@
+@@ -452,7 +456,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -14121,7 +13323,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -492,9 +494,9 @@
+@@ -490,9 +494,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14133,15 +13335,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- xparts/src/Makefile.in
-+++ xparts/src/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -200,6 +200,9 @@
+--- xparts/src/gtk/Makefile.in
++++ xparts/src/gtk/Makefile.in
+@@ -222,6 +222,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14151,7 +13347,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -231,6 +234,7 @@
+@@ -253,6 +256,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -14159,16 +13355,16 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -387,7 +391,7 @@
- all: docs-am all-recursive
+@@ -417,7 +421,7 @@
.SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -425,9 +429,9 @@
+@@ -455,9 +459,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14178,26 +13374,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
---- xparts/src/gtk/Makefile.in
-+++ xparts/src/gtk/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libgtkxparts_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -224,6 +222,9 @@
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- xparts/src/interfaces/Makefile.in
++++ xparts/src/interfaces/Makefile.in
+@@ -197,6 +197,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14207,7 +13388,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -255,6 +256,7 @@
+@@ -228,6 +231,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -14215,16 +13396,16 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -419,7 +421,7 @@
+@@ -384,7 +388,7 @@
+ all: docs-am all-am
.SUFFIXES:
- .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -457,9 +459,9 @@
+@@ -422,9 +426,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14234,17 +13415,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
---- xparts/src/interfaces/Makefile.in
-+++ xparts/src/interfaces/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-@@ -197,6 +197,9 @@
+ mostlyclean-libtool:
+--- xparts/src/kde/Makefile.in
++++ xparts/src/kde/Makefile.in
+@@ -226,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14254,7 +13429,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -228,6 +231,7 @@
+@@ -257,6 +260,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -14262,16 +13437,16 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -384,7 +388,7 @@
- all: docs-am all-am
+@@ -429,7 +433,7 @@
.SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -422,9 +426,9 @@
+@@ -467,9 +471,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14281,26 +13456,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
---- xparts/src/kde/Makefile.in
-+++ xparts/src/kde/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libkdexparts_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -228,6 +226,9 @@
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- xparts/src/Makefile.in
++++ xparts/src/Makefile.in
+@@ -200,6 +200,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14310,7 +13470,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -259,6 +260,7 @@
+@@ -231,6 +234,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -14318,16 +13478,16 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -431,7 +433,7 @@
+@@ -387,7 +391,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -469,9 +471,9 @@
+@@ -425,9 +429,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14337,26 +13497,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
+
+ mostlyclean-libtool:
--- xparts/xpart_notepad/Makefile.in
+++ xparts/xpart_notepad/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(libxp_notepadpart_la_SOURCES) $(shell_xparthost_SOURCES) $(xp_notepad_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -248,6 +246,9 @@
+@@ -246,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14366,7 +13511,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -279,6 +280,7 @@
+@@ -277,6 +280,7 @@
RUBY_ARCHDIR = @RUBY_ARCHDIR@
RUBY_LIBDIR = @RUBY_LIBDIR@
RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -14374,7 +13519,7 @@
RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
RUBY_SITEDIR = @RUBY_SITEDIR@
SET_MAKE = @SET_MAKE@
-@@ -453,7 +455,7 @@
+@@ -451,7 +455,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14383,7 +13528,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -491,9 +493,9 @@
+@@ -489,9 +493,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14395,37 +13540,3 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -802,18 +804,18 @@
- .NOEXPORT:
-
- #>+ 3
--xp_notepad_factory.moc: $(srcdir)/xp_notepad_factory.h
-- $(MOC) $(srcdir)/xp_notepad_factory.h -o xp_notepad_factory.moc
-+shell_xparthost.moc: $(srcdir)/shell_xparthost.h
-+ $(MOC) $(srcdir)/shell_xparthost.h -o shell_xparthost.moc
-
- #>+ 2
--mocs: xp_notepad_factory.moc
-+mocs: shell_xparthost.moc
-
- #>+ 3
--shell_xparthost.moc: $(srcdir)/shell_xparthost.h
-- $(MOC) $(srcdir)/shell_xparthost.h -o shell_xparthost.moc
-+xp_notepad_factory.moc: $(srcdir)/xp_notepad_factory.h
-+ $(MOC) $(srcdir)/xp_notepad_factory.h -o xp_notepad_factory.moc
-
- #>+ 2
--mocs: shell_xparthost.moc
-+mocs: xp_notepad_factory.moc
-
- #>+ 9
- xpart.kidl: $(srcdir)/../src/interfaces/xpart.h $(DCOP_DEPENDENCIES)
-@@ -827,7 +829,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f xp_notepad_factory.moc shell_xparthost.moc
-+ -rm -f shell_xparthost.moc xp_notepad_factory.moc
-
- #>+ 2
- KDE_DIST=xp_notepad_factory.h xp_notepad.rc shell_xparthost.h Makefile.am shell_xparthost.rc Makefile.in xp_notepad.desktop
More information about the pkg-kde-commits
mailing list