diff options
34 files changed, 977 insertions, 977 deletions
@@ -4,7 +4,7 @@ Basic Installation from the console: $ cd path/to/mallory-1.0 - $ ./configure --prefix=`kde-config --prefix` + $ ./configure --prefix=`tde-config --prefix` $ make @@ -106,7 +106,7 @@ JAR = @JAR@ JAVAC = @JAVAC@ JAVAH = @JAVAH@ JVMLIBS = @JVMLIBS@ -KDECONFIG = /opt/kde3/bin/kde-config +KDECONFIG = /opt/kde3/bin/tde-config KDE_EXTRA_RPATH = KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ KDE_HAVE_DOT = @KDE_HAVE_DOT@ @@ -151,18 +151,18 @@ LIBUTIL = -lutil LIBZ = -lz LIB_JASPER = @LIB_JASPER@ LIB_KAB = -lkab -LIB_KABC = -lkabc -LIB_KDECORE = -lkdecore -LIB_KDEPRINT = -lkdeprint -LIB_KDEUI = -lkdeui -LIB_KFILE = -lkio +LIB_KABC = -ltdeabc +LIB_TDECORE = -ltdecore +LIB_TDEPRINT = -ltdeprint +LIB_TDEUI = -ltdeui +LIB_KFILE = -ltdeio LIB_KFM = -LIB_KHTML = -lkhtml +LIB_TDEHTML = -ltdehtml LIB_KIMGIO = @LIB_KIMGIO@ -LIB_KIO = -lkio -LIB_KPARTS = -lkparts -LIB_KSPELL = -lkspell -LIB_KSYCOCA = -lkio +LIB_TDEIO = -ltdeio +LIB_TDEPARTS = -ltdeparts +LIB_TDESPELL = -ltdespell +LIB_TDESYCOCA = -ltdeio LIB_POLL = LIB_QPE = LIB_QT = -ltqt-mt $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread @@ -245,7 +245,7 @@ kde_styledir = ${libdir}/kde3/plugins/styles kde_templatesdir = ${prefix}/share/templates kde_wallpaperdir = ${prefix}/share/wallpapers kde_widgetdir = /opt/kde3/lib/kde3/plugins/designer -kdeinitdir = $(kde_moduledir) +tdeinitdir = $(kde_moduledir) micodir = @micodir@ qt_includes = /usr/lib/qt3/include qt_libraries = /usr/lib/qt3/lib diff --git a/Makefile.in b/Makefile.in index 8448ba4..29f1644 100644 --- a/Makefile.in +++ b/Makefile.in @@ -151,17 +151,17 @@ LIBZ = @LIBZ@ LIB_JASPER = @LIB_JASPER@ LIB_KAB = @LIB_KAB@ LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ +LIB_TDECORE = @LIB_TDECORE@ +LIB_TDEPRINT = @LIB_TDEPRINT@ +LIB_TDEUI = @LIB_TDEUI@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ +LIB_TDEHTML = @LIB_TDEHTML@ LIB_KIMGIO = @LIB_KIMGIO@ -LIB_KIO = @LIB_KIO@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ +LIB_TDEIO = @LIB_TDEIO@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ @@ -244,7 +244,7 @@ kde_styledir = @kde_styledir@ kde_templatesdir = @kde_templatesdir@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ +tdeinitdir = @tdeinitdir@ micodir = @micodir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ diff --git a/acinclude.m4 b/acinclude.m4 index a272479..947048e 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -23,8 +23,8 @@ dnl IMPORTANT NOTE: dnl Please do not modify this file unless you expect your modifications to be dnl carried into every other module in the repository. dnl -dnl Single-module modifications are best placed in configure.in for kdelibs -dnl and kdebase or configure.in.in if present. +dnl Single-module modifications are best placed in configure.in for tdelibs +dnl and tdebase or configure.in.in if present. # KDE_PATH_X_DIRECT dnl Internal subroutine of AC_PATH_X. @@ -103,41 +103,41 @@ ac_x_libraries=], [LIBS="$ac_save_LIBS" # First see if replacing the include by lib works. # Check X11 before X11Rn because it is often a symlink to the current release. -for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \ - /usr/X11/lib${kdelibsuff} \ - /usr/X11R6/lib${kdelibsuff} \ - /usr/X11R5/lib${kdelibsuff} \ - /usr/X11R4/lib${kdelibsuff} \ +for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \ + /usr/X11/lib${tdelibsuff} \ + /usr/X11R6/lib${tdelibsuff} \ + /usr/X11R5/lib${tdelibsuff} \ + /usr/X11R4/lib${tdelibsuff} \ \ - /usr/lib${kdelibsuff}/X11 \ - /usr/lib${kdelibsuff}/X11R6 \ - /usr/lib${kdelibsuff}/X11R5 \ - /usr/lib${kdelibsuff}/X11R4 \ + /usr/lib${tdelibsuff}/X11 \ + /usr/lib${tdelibsuff}/X11R6 \ + /usr/lib${tdelibsuff}/X11R5 \ + /usr/lib${tdelibsuff}/X11R4 \ \ - /usr/local/X11/lib${kdelibsuff} \ - /usr/local/X11R6/lib${kdelibsuff} \ - /usr/local/X11R5/lib${kdelibsuff} \ - /usr/local/X11R4/lib${kdelibsuff} \ + /usr/local/X11/lib${tdelibsuff} \ + /usr/local/X11R6/lib${tdelibsuff} \ + /usr/local/X11R5/lib${tdelibsuff} \ + /usr/local/X11R4/lib${tdelibsuff} \ \ - /usr/local/lib${kdelibsuff}/X11 \ - /usr/local/lib${kdelibsuff}/X11R6 \ - /usr/local/lib${kdelibsuff}/X11R5 \ - /usr/local/lib${kdelibsuff}/X11R4 \ + /usr/local/lib${tdelibsuff}/X11 \ + /usr/local/lib${tdelibsuff}/X11R6 \ + /usr/local/lib${tdelibsuff}/X11R5 \ + /usr/local/lib${tdelibsuff}/X11R4 \ \ - /usr/X386/lib${kdelibsuff} \ - /usr/x386/lib${kdelibsuff} \ - /usr/XFree86/lib${kdelibsuff}/X11 \ + /usr/X386/lib${tdelibsuff} \ + /usr/x386/lib${tdelibsuff} \ + /usr/XFree86/lib${tdelibsuff}/X11 \ \ - /usr/lib${kdelibsuff} \ - /usr/local/lib${kdelibsuff} \ - /usr/unsupported/lib${kdelibsuff} \ - /usr/athena/lib${kdelibsuff} \ - /usr/local/x11r5/lib${kdelibsuff} \ - /usr/lpp/Xamples/lib${kdelibsuff} \ - /lib/usr/lib${kdelibsuff}/X11 \ + /usr/lib${tdelibsuff} \ + /usr/local/lib${tdelibsuff} \ + /usr/unsupported/lib${tdelibsuff} \ + /usr/athena/lib${tdelibsuff} \ + /usr/local/x11r5/lib${tdelibsuff} \ + /usr/lpp/Xamples/lib${tdelibsuff} \ + /lib/usr/lib${tdelibsuff}/X11 \ \ - /usr/openwin/lib${kdelibsuff} \ - /usr/openwin/share/lib${kdelibsuff} \ + /usr/openwin/lib${tdelibsuff} \ + /usr/openwin/share/lib${tdelibsuff} \ ; \ do dnl Don't even attempt the hair of trying to link an X program! @@ -356,24 +356,24 @@ AC_DEFUN(KDE_1_CHECK_PATHS, fi AC_MSG_CHECKING([for KDE libraries installed]) -ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' +ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5' if AC_TRY_EVAL(ac_link) && test -s conftest; then AC_MSG_RESULT(yes) else AC_MSG_ERROR([your system fails at linking a small KDE application! Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and kdelibs as you did use now. +same compiler to compile Qt and tdelibs as you did use now. For more details about this problem, look at the end of config.log.]) fi -if eval `KDEDIR= ./conftest 2>&5`; then +if eval `TDEDIR= ./conftest 2>&5`; then kde_result=done else kde_result=problems fi -KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log +TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log kde_have_all_paths=yes KDE_SET_PATHS($kde_result) @@ -529,11 +529,11 @@ AC_DEFUN(KDE_SUBST_PROGRAMS, AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no") kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" - test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" - if test -n "$KDEDIRS"; then + test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs" + if test -n "$TDEDIRS"; then kde_save_IFS=$IFS IFS=: - for dir in $KDEDIRS; do + for dir in $TDEDIRS; do kde_default_bindirs="$dir/bin $kde_default_bindirs " done IFS=$kde_save_IFS @@ -545,16 +545,16 @@ AC_DEFUN(KDE_SUBST_PROGRAMS, KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)]) KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)]) fi - KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs]) + KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs]) KDE_FIND_PATH(brockenboring, BROCKENBORING, [$kde_default_bindirs]) if test -n "$BROCKENBORING"; then - KDE_FIND_PATH(kdeinit_wrapper, BROCKENBORING, [$kde_default_bindirs]) + KDE_FIND_PATH(tdeinit_wrapper, BROCKENBORING, [$kde_default_bindirs]) fi KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs]) if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share" - test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" + test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs" AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) if test "$KDE_XSL_STYLESHEET" = "NO"; then KDE_XSL_STYLESHEET="" @@ -577,9 +577,9 @@ AC_DEFUN(KDE_SUBST_PROGRAMS, if test -x "$KDECONFIG"; then # it can be "compiled" kde_libs_prefix=`$KDECONFIG --prefix` if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then - AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. + AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs. This means it has been moved since you installed it. - This won't work. Please recompile kdelibs for the new prefix. + This won't work. Please recompile tdelibs for the new prefix. ]) fi kde_libs_htmldir=`$KDECONFIG --install html --expandvars` @@ -659,7 +659,7 @@ AC_SUBST(kde_templatesdir) AC_SUBST(kde_servicesdir) AC_SUBST(kde_servicetypesdir) AC_SUBST(kde_moduledir) -AC_SUBST(kdeinitdir, '$(kde_moduledir)') +AC_SUBST(tdeinitdir, '$(kde_moduledir)') AC_SUBST(kde_styledir) AC_SUBST(kde_widgetdir) if test "$kde_qtver" = 1; then @@ -863,7 +863,7 @@ mips-sgi-irix6*) ac_x_includes="." fi if test -z "$ac_x_libraries"; then - ac_x_libraries="/usr/lib${kdelibsuff}" + ac_x_libraries="/usr/lib${tdelibsuff}" fi esac #from now on we use our own again @@ -1337,7 +1337,7 @@ qt_includes="" AC_ARG_WITH(qt-dir, [ --with-qt-dir=DIR where the root of Qt is installed ], [ ac_qt_includes="$withval"/include - ac_qt_libraries="$withval"/lib${kdelibsuff} + ac_qt_libraries="$withval"/lib${tdelibsuff} ac_qt_bindir="$withval"/bin ]) @@ -1378,7 +1378,7 @@ ac_qt_includes="$qt_incdir" qt_libdirs="" for dir in $kde_qt_dirs; do - qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" + qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir" done qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" if test ! "$ac_qt_libraries" = "NO"; then @@ -1547,7 +1547,7 @@ rm -f actest.ui actest.cpp AC_MSG_RESULT([$kde_cv_uic_plugins]) if test "$kde_cv_uic_plugins" != yes; then - AC_MSG_ERROR([you need to install kdelibs first.]) + AC_MSG_ERROR([you need to install tdelibs first.]) fi fi ]) @@ -1631,12 +1631,12 @@ if test "${prefix}" != NONE; then if test "${exec_prefix}" != NONE; then kde_libraries=${libdir} ac_kde_libraries=$libdir - if test "$ac_kde_libraries" = '${exec_prefix}/lib'${kdelibsuff}; then - ac_kde_libraries=$exec_prefix/lib${kdelibsuff} + if test "$ac_kde_libraries" = '${exec_prefix}/lib'${tdelibsuff}; then + ac_kde_libraries=$exec_prefix/lib${tdelibsuff} fi else - kde_libraries=${prefix}/lib${kdelibsuff} - ac_kde_libraries=$prefix/lib${kdelibsuff} + kde_libraries=${prefix}/lib${tdelibsuff} + ac_kde_libraries=$prefix/lib${tdelibsuff} fi else ac_kde_includes= @@ -1650,16 +1650,16 @@ AC_CACHE_VAL(ac_cv_have_kde, if test "$kde_qtver" = 1; then kde_check_header="ksock.h" - kde_check_lib="libkdecore.la" + kde_check_lib="libtdecore.la" else kde_check_header="ksharedptr.h" - kde_check_lib="libkio.la" + kde_check_lib="libtdeio.la" fi if test -z "$1"; then -kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" -test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" +kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" +test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs" AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) ac_kde_includes="$kde_incdir" @@ -1670,15 +1670,15 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail. So, check this please and use another prefix!]) fi -kde_libdirs="/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" -test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" +kde_libdirs="/usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}" +test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) ac_kde_libraries="$kde_libdir" kde_widgetdir=NO dnl this might be somewhere else -AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir) +AC_FIND_FILE("kde3/plugins/designer/tdewidgets.la", $kde_libdirs, kde_widgetdir) if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then AC_MSG_ERROR([ @@ -1686,10 +1686,10 @@ in the prefix, you've chosen, are no KDE libraries installed. This will fail. So, check this please and use another prefix!]) fi -if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then +if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/tdewidgets.la"; then AC_MSG_ERROR([ I can't find the designer plugins. These are required and should have been installed -by kdelibs]) +by tdelibs]) fi if test -n "$kde_widgetdir"; then @@ -1845,20 +1845,20 @@ cat > conftest.$ac_ext <<EOF #include <kapp.h> int main() { - printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); - printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); - printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); - printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); - printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); - printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); - printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); - printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); - printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); - printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); + printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data()); + printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data()); + printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data()); + printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data()); + printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data()); + printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data()); + printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data()); + printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data()); + printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data()); + printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data()); printf("kde_wallpaperdir=\\"%s\\"\n", - KApplication::kde_wallpaperdir().data()); - printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); - printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); + TDEApplication::kde_wallpaperdir().data()); + printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data()); + printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data()); printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n"); @@ -1892,7 +1892,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon, kde_cxxflags_safe="$CXXFLAGS" LIBS="-lkde-qt-addon $LIBQT $LIBS" - CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes" + CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes" LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" AC_TRY_LINK([ @@ -1956,37 +1956,37 @@ AC_DEFUN(KDE_CREATE_LIBS_ALIASES, AC_REQUIRE([K_PATH_X]) if test $kde_qtver = 3; then - AC_SUBST(LIB_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-lkio") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + AC_SUBST(LIB_TDEIO, "-ltdeio") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KABC, "-lkabc") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") - AC_SUBST(LIB_KDEPRINT, "-lkdeprint") + AC_SUBST(LIB_KABC, "-ltdeabc") + AC_SUBST(LIB_TDEHTML, "-ltdehtml") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") # these are for backward compatibility - AC_SUBST(LIB_KSYCOCA, "-lkio") - AC_SUBST(LIB_KFILE, "-lkio") + AC_SUBST(LIB_TDESYCOCA, "-ltdeio") + AC_SUBST(LIB_KFILE, "-ltdeio") elif test $kde_qtver = 2; then - AC_SUBST(LIB_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-lkio") - AC_SUBST(LIB_KSYCOCA, "-lksycoca") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + AC_SUBST(LIB_TDEIO, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-lkfile") + AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") - AC_SUBST(LIB_KDEPRINT, "-lkdeprint") + AC_SUBST(LIB_TDEHTML, "-ltdehtml") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else - AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)") - AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)") - AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)") - AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)") - AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") + AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") + AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") + AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") + AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) @@ -2051,7 +2051,7 @@ if test "x$kde_cv_func_$1" = xyes; then else case "$1" in setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) - kde_cv_proto_$1="yes - in libkdefakes" + kde_cv_proto_$1="yes - in libtdefakes" ;; *) kde_cv_proto_$1=unknown @@ -2327,7 +2327,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then AC_MSG_RESULT(yes) AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) else - AC_MSG_ERROR(You need giflib30. Please install the kdesupport package) + AC_MSG_ERROR(You need giflib30. Please install the tdesupport package) fi ]) @@ -2392,7 +2392,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir) test "x$jpeg_incdir" = xNO && jpeg_incdir= dnl if headers _and_ libraries are missing, this is no error, and we -dnl continue with a warning (the user will get no jpeg support in khtml) +dnl continue with a warning (the user will get no jpeg support in tdehtml) dnl if only one is missing, it means a configuration error, but we still dnl only warn if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then @@ -3014,26 +3014,26 @@ See http:://objprelink.sourceforge.net for details: AC_DEFUN(KDE_CHECK_LIB64, [ - kdelibsuff=none + tdelibsuff=none AC_ARG_ENABLE(libsuffix, AC_HELP_STRING([--enable-libsuffix], [/lib directory suffix (64,32,none[=default])]), - kdelibsuff=$enableval) + tdelibsuff=$enableval) # TODO: add an auto case that compiles a little C app to check # where the glibc is - if test "$kdelibsuff" = "none"; then - kdelibsuff= + if test "$tdelibsuff" = "none"; then + tdelibsuff= fi - if test -z "$kdelibsuff"; then + if test -z "$tdelibsuff"; then AC_MSG_RESULT([not using lib directory suffix]) AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories) else if test "$libdir" = '${exec_prefix}/lib'; then - libdir="$libdir${kdelibsuff}" + libdir="$libdir${tdelibsuff}" AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms fi - AC_DEFINE_UNQUOTED(KDELIBSUFF, ["\"${kdelibsuff}\""], Suffix for lib directories) - AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) + AC_DEFINE_UNQUOTED(KDELIBSUFF, ["\"${tdelibsuff}\""], Suffix for lib directories) + AC_MSG_RESULT([using lib directory suffix $tdelibsuff]) fi ]) @@ -3049,7 +3049,7 @@ AC_CANONICAL_SYSTEM AC_ARG_PROGRAM AM_INIT_AUTOMAKE($1, $2) AM_DISABLE_LIBRARIES -AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) +AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) AC_CHECK_COMPILERS KDE_PROG_LIBTOOL AM_KDE_WITH_NLS @@ -4608,8 +4608,8 @@ AC_DEFUN(KDE_CONF_FILES, AC_DEFUN(KDE_SET_PREFIX, [ unset CDPATH - dnl make $KDEDIR the default for the installation - AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) + dnl make $TDEDIR the default for the installation + AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) if test "x$prefix" = "xNONE"; then prefix=$ac_default_prefix @@ -5212,7 +5212,7 @@ ssl_includes="" AC_ARG_WITH(ssl-dir, [ --with-ssl-dir=DIR where the root of OpenSSL is installed], [ ac_ssl_includes="$withval"/include - ac_ssl_libraries="$withval"/lib$kdelibsuff + ac_ssl_libraries="$withval"/lib$tdelibsuff ]) want_ssl=yes @@ -5232,7 +5232,7 @@ AC_CACHE_VAL(ac_cv_have_ssl, AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir) ac_ssl_includes="$ssl_incdir" - ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs" + ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs" if test ! "$ac_ssl_libraries" = "NO"; then ssl_libdirs="$ac_ssl_libraries $ssl_libdirs" fi @@ -35,8 +35,8 @@ dnl IMPORTANT NOTE: dnl Please do not modify this file unless you expect your modifications to be dnl carried into every other module in the repository. dnl -dnl Single-module modifications are best placed in configure.in for kdelibs -dnl and kdebase or configure.in.in if present. +dnl Single-module modifications are best placed in configure.in for tdelibs +dnl and tdebase or configure.in.in if present. # KDE_PATH_X_DIRECT dnl Internal subroutine of AC_PATH_X. @@ -115,41 +115,41 @@ ac_x_libraries=], [LIBS="$ac_save_LIBS" # First see if replacing the include by lib works. # Check X11 before X11Rn because it is often a symlink to the current release. -for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \ - /usr/X11/lib${kdelibsuff} \ - /usr/X11R6/lib${kdelibsuff} \ - /usr/X11R5/lib${kdelibsuff} \ - /usr/X11R4/lib${kdelibsuff} \ +for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \ + /usr/X11/lib${tdelibsuff} \ + /usr/X11R6/lib${tdelibsuff} \ + /usr/X11R5/lib${tdelibsuff} \ + /usr/X11R4/lib${tdelibsuff} \ \ - /usr/lib${kdelibsuff}/X11 \ - /usr/lib${kdelibsuff}/X11R6 \ - /usr/lib${kdelibsuff}/X11R5 \ - /usr/lib${kdelibsuff}/X11R4 \ + /usr/lib${tdelibsuff}/X11 \ + /usr/lib${tdelibsuff}/X11R6 \ + /usr/lib${tdelibsuff}/X11R5 \ + /usr/lib${tdelibsuff}/X11R4 \ \ - /usr/local/X11/lib${kdelibsuff} \ - /usr/local/X11R6/lib${kdelibsuff} \ - /usr/local/X11R5/lib${kdelibsuff} \ - /usr/local/X11R4/lib${kdelibsuff} \ + /usr/local/X11/lib${tdelibsuff} \ + /usr/local/X11R6/lib${tdelibsuff} \ + /usr/local/X11R5/lib${tdelibsuff} \ + /usr/local/X11R4/lib${tdelibsuff} \ \ - /usr/local/lib${kdelibsuff}/X11 \ - /usr/local/lib${kdelibsuff}/X11R6 \ - /usr/local/lib${kdelibsuff}/X11R5 \ - /usr/local/lib${kdelibsuff}/X11R4 \ + /usr/local/lib${tdelibsuff}/X11 \ + /usr/local/lib${tdelibsuff}/X11R6 \ + /usr/local/lib${tdelibsuff}/X11R5 \ + /usr/local/lib${tdelibsuff}/X11R4 \ \ - /usr/X386/lib${kdelibsuff} \ - /usr/x386/lib${kdelibsuff} \ - /usr/XFree86/lib${kdelibsuff}/X11 \ + /usr/X386/lib${tdelibsuff} \ + /usr/x386/lib${tdelibsuff} \ + /usr/XFree86/lib${tdelibsuff}/X11 \ \ - /usr/lib${kdelibsuff} \ - /usr/local/lib${kdelibsuff} \ - /usr/unsupported/lib${kdelibsuff} \ - /usr/athena/lib${kdelibsuff} \ - /usr/local/x11r5/lib${kdelibsuff} \ - /usr/lpp/Xamples/lib${kdelibsuff} \ - /lib/usr/lib${kdelibsuff}/X11 \ + /usr/lib${tdelibsuff} \ + /usr/local/lib${tdelibsuff} \ + /usr/unsupported/lib${tdelibsuff} \ + /usr/athena/lib${tdelibsuff} \ + /usr/local/x11r5/lib${tdelibsuff} \ + /usr/lpp/Xamples/lib${tdelibsuff} \ + /lib/usr/lib${tdelibsuff}/X11 \ \ - /usr/openwin/lib${kdelibsuff} \ - /usr/openwin/share/lib${kdelibsuff} \ + /usr/openwin/lib${tdelibsuff} \ + /usr/openwin/share/lib${tdelibsuff} \ ; \ do dnl Don't even attempt the hair of trying to link an X program! @@ -368,24 +368,24 @@ AC_DEFUN(KDE_1_CHECK_PATHS, fi AC_MSG_CHECKING([for KDE libraries installed]) -ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' +ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5' if AC_TRY_EVAL(ac_link) && test -s conftest; then AC_MSG_RESULT(yes) else AC_MSG_ERROR([your system fails at linking a small KDE application! Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and kdelibs as you did use now. +same compiler to compile Qt and tdelibs as you did use now. For more details about this problem, look at the end of config.log.]) fi -if eval `KDEDIR= ./conftest 2>&5`; then +if eval `TDEDIR= ./conftest 2>&5`; then kde_result=done else kde_result=problems fi -KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log +TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log kde_have_all_paths=yes KDE_SET_PATHS($kde_result) @@ -541,11 +541,11 @@ AC_DEFUN(KDE_SUBST_PROGRAMS, AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no") kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" - test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" - if test -n "$KDEDIRS"; then + test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs" + if test -n "$TDEDIRS"; then kde_save_IFS=$IFS IFS=: - for dir in $KDEDIRS; do + for dir in $TDEDIRS; do kde_default_bindirs="$dir/bin $kde_default_bindirs " done IFS=$kde_save_IFS @@ -557,16 +557,16 @@ AC_DEFUN(KDE_SUBST_PROGRAMS, KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)]) KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)]) fi - KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs]) + KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs]) KDE_FIND_PATH(brockenboring, BROCKENBORING, [$kde_default_bindirs]) if test -n "$BROCKENBORING"; then - KDE_FIND_PATH(kdeinit_wrapper, BROCKENBORING, [$kde_default_bindirs]) + KDE_FIND_PATH(tdeinit_wrapper, BROCKENBORING, [$kde_default_bindirs]) fi KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs]) if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share" - test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" + test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs" AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) if test "$KDE_XSL_STYLESHEET" = "NO"; then KDE_XSL_STYLESHEET="" @@ -589,9 +589,9 @@ AC_DEFUN(KDE_SUBST_PROGRAMS, if test -x "$KDECONFIG"; then # it can be "compiled" kde_libs_prefix=`$KDECONFIG --prefix` if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then - AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. + AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs. This means it has been moved since you installed it. - This won't work. Please recompile kdelibs for the new prefix. + This won't work. Please recompile tdelibs for the new prefix. ]) fi kde_libs_htmldir=`$KDECONFIG --install html --expandvars` @@ -671,7 +671,7 @@ AC_SUBST(kde_templatesdir) AC_SUBST(kde_servicesdir) AC_SUBST(kde_servicetypesdir) AC_SUBST(kde_moduledir) -AC_SUBST(kdeinitdir, '$(kde_moduledir)') +AC_SUBST(tdeinitdir, '$(kde_moduledir)') AC_SUBST(kde_styledir) AC_SUBST(kde_widgetdir) if test "$kde_qtver" = 1; then @@ -875,7 +875,7 @@ mips-sgi-irix6*) ac_x_includes="." fi if test -z "$ac_x_libraries"; then - ac_x_libraries="/usr/lib${kdelibsuff}" + ac_x_libraries="/usr/lib${tdelibsuff}" fi esac #from now on we use our own again @@ -1349,7 +1349,7 @@ qt_includes="" AC_ARG_WITH(qt-dir, [ --with-qt-dir=DIR where the root of Qt is installed ], [ ac_qt_includes="$withval"/include - ac_qt_libraries="$withval"/lib${kdelibsuff} + ac_qt_libraries="$withval"/lib${tdelibsuff} ac_qt_bindir="$withval"/bin ]) @@ -1390,7 +1390,7 @@ ac_qt_includes="$qt_incdir" qt_libdirs="" for dir in $kde_qt_dirs; do - qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" + qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir" done qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" if test ! "$ac_qt_libraries" = "NO"; then @@ -1559,7 +1559,7 @@ rm -f actest.ui actest.cpp AC_MSG_RESULT([$kde_cv_uic_plugins]) if test "$kde_cv_uic_plugins" != yes; then - AC_MSG_ERROR([you need to install kdelibs first.]) + AC_MSG_ERROR([you need to install tdelibs first.]) fi fi ]) @@ -1643,12 +1643,12 @@ if test "${prefix}" != NONE; then if test "${exec_prefix}" != NONE; then kde_libraries=${libdir} ac_kde_libraries=$libdir - if test "$ac_kde_libraries" = '${exec_prefix}/lib'${kdelibsuff}; then - ac_kde_libraries=$exec_prefix/lib${kdelibsuff} + if test "$ac_kde_libraries" = '${exec_prefix}/lib'${tdelibsuff}; then + ac_kde_libraries=$exec_prefix/lib${tdelibsuff} fi else - kde_libraries=${prefix}/lib${kdelibsuff} - ac_kde_libraries=$prefix/lib${kdelibsuff} + kde_libraries=${prefix}/lib${tdelibsuff} + ac_kde_libraries=$prefix/lib${tdelibsuff} fi else ac_kde_includes= @@ -1662,16 +1662,16 @@ AC_CACHE_VAL(ac_cv_have_kde, if test "$kde_qtver" = 1; then kde_check_header="ksock.h" - kde_check_lib="libkdecore.la" + kde_check_lib="libtdecore.la" else kde_check_header="ksharedptr.h" - kde_check_lib="libkio.la" + kde_check_lib="libtdeio.la" fi if test -z "$1"; then -kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" -test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" +kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" +test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs" AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) ac_kde_includes="$kde_incdir" @@ -1682,15 +1682,15 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail. So, check this please and use another prefix!]) fi -kde_libdirs="/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" -test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" +kde_libdirs="/usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}" +test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) ac_kde_libraries="$kde_libdir" kde_widgetdir=NO dnl this might be somewhere else -AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir) +AC_FIND_FILE("kde3/plugins/designer/tdewidgets.la", $kde_libdirs, kde_widgetdir) if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then AC_MSG_ERROR([ @@ -1698,10 +1698,10 @@ in the prefix, you've chosen, are no KDE libraries installed. This will fail. So, check this please and use another prefix!]) fi -if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then +if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/tdewidgets.la"; then AC_MSG_ERROR([ I can't find the designer plugins. These are required and should have been installed -by kdelibs]) +by tdelibs]) fi if test -n "$kde_widgetdir"; then @@ -1857,20 +1857,20 @@ cat > conftest.$ac_ext <<EOF #include <kapp.h> int main() { - printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); - printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); - printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); - printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); - printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); - printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); - printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); - printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); - printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); - printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); + printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data()); + printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data()); + printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data()); + printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data()); + printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data()); + printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data()); + printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data()); + printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data()); + printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data()); + printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data()); printf("kde_wallpaperdir=\\"%s\\"\n", - KApplication::kde_wallpaperdir().data()); - printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); - printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); + TDEApplication::kde_wallpaperdir().data()); + printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data()); + printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data()); printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n"); @@ -1904,7 +1904,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon, kde_cxxflags_safe="$CXXFLAGS" LIBS="-lkde-qt-addon $LIBQT $LIBS" - CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes" + CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes" LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" AC_TRY_LINK([ @@ -1968,37 +1968,37 @@ AC_DEFUN(KDE_CREATE_LIBS_ALIASES, AC_REQUIRE([K_PATH_X]) if test $kde_qtver = 3; then - AC_SUBST(LIB_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-lkio") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + AC_SUBST(LIB_TDEIO, "-ltdeio") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KABC, "-lkabc") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") - AC_SUBST(LIB_KDEPRINT, "-lkdeprint") + AC_SUBST(LIB_KABC, "-ltdeabc") + AC_SUBST(LIB_TDEHTML, "-ltdehtml") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") # these are for backward compatibility - AC_SUBST(LIB_KSYCOCA, "-lkio") - AC_SUBST(LIB_KFILE, "-lkio") + AC_SUBST(LIB_TDESYCOCA, "-ltdeio") + AC_SUBST(LIB_KFILE, "-ltdeio") elif test $kde_qtver = 2; then - AC_SUBST(LIB_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-lkio") - AC_SUBST(LIB_KSYCOCA, "-lksycoca") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + AC_SUBST(LIB_TDEIO, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-lkfile") + AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") - AC_SUBST(LIB_KDEPRINT, "-lkdeprint") + AC_SUBST(LIB_TDEHTML, "-ltdehtml") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else - AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)") - AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)") - AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)") - AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)") - AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") + AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") + AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") + AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") + AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) @@ -2063,7 +2063,7 @@ if test "x$kde_cv_func_$1" = xyes; then else case "$1" in setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) - kde_cv_proto_$1="yes - in libkdefakes" + kde_cv_proto_$1="yes - in libtdefakes" ;; *) kde_cv_proto_$1=unknown @@ -2339,7 +2339,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then AC_MSG_RESULT(yes) AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) else - AC_MSG_ERROR(You need giflib30. Please install the kdesupport package) + AC_MSG_ERROR(You need giflib30. Please install the tdesupport package) fi ]) @@ -2404,7 +2404,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir) test "x$jpeg_incdir" = xNO && jpeg_incdir= dnl if headers _and_ libraries are missing, this is no error, and we -dnl continue with a warning (the user will get no jpeg support in khtml) +dnl continue with a warning (the user will get no jpeg support in tdehtml) dnl if only one is missing, it means a configuration error, but we still dnl only warn if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then @@ -3026,26 +3026,26 @@ See http:://objprelink.sourceforge.net for details: AC_DEFUN(KDE_CHECK_LIB64, [ - kdelibsuff=none + tdelibsuff=none AC_ARG_ENABLE(libsuffix, AC_HELP_STRING([--enable-libsuffix], [/lib directory suffix (64,32,none[=default])]), - kdelibsuff=$enableval) + tdelibsuff=$enableval) # TODO: add an auto case that compiles a little C app to check # where the glibc is - if test "$kdelibsuff" = "none"; then - kdelibsuff= + if test "$tdelibsuff" = "none"; then + tdelibsuff= fi - if test -z "$kdelibsuff"; then + if test -z "$tdelibsuff"; then AC_MSG_RESULT([not using lib directory suffix]) AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories) else if test "$libdir" = '${exec_prefix}/lib'; then - libdir="$libdir${kdelibsuff}" + libdir="$libdir${tdelibsuff}" AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms fi - AC_DEFINE_UNQUOTED(KDELIBSUFF, ["\"${kdelibsuff}\""], Suffix for lib directories) - AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) + AC_DEFINE_UNQUOTED(KDELIBSUFF, ["\"${tdelibsuff}\""], Suffix for lib directories) + AC_MSG_RESULT([using lib directory suffix $tdelibsuff]) fi ]) @@ -3061,7 +3061,7 @@ AC_CANONICAL_SYSTEM AC_ARG_PROGRAM AM_INIT_AUTOMAKE($1, $2) AM_DISABLE_LIBRARIES -AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) +AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) AC_CHECK_COMPILERS KDE_PROG_LIBTOOL AM_KDE_WITH_NLS @@ -4620,8 +4620,8 @@ AC_DEFUN(KDE_CONF_FILES, AC_DEFUN(KDE_SET_PREFIX, [ unset CDPATH - dnl make $KDEDIR the default for the installation - AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) + dnl make $TDEDIR the default for the installation + AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) if test "x$prefix" = "xNONE"; then prefix=$ac_default_prefix @@ -5224,7 +5224,7 @@ ssl_includes="" AC_ARG_WITH(ssl-dir, [ --with-ssl-dir=DIR where the root of OpenSSL is installed], [ ac_ssl_includes="$withval"/include - ac_ssl_libraries="$withval"/lib$kdelibsuff + ac_ssl_libraries="$withval"/lib$tdelibsuff ]) want_ssl=yes @@ -5244,7 +5244,7 @@ AC_CACHE_VAL(ac_cv_have_ssl, AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir) ac_ssl_includes="$ssl_incdir" - ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs" + ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs" if test ! "$ac_ssl_libraries" = "NO"; then ssl_libdirs="$ac_ssl_libraries $ssl_libdirs" fi diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in index 61e38f5..200486d 100644 --- a/admin/acinclude.m4.in +++ b/admin/acinclude.m4.in @@ -23,8 +23,8 @@ dnl IMPORTANT NOTE: dnl Please do not modify this file unless you expect your modifications to be dnl carried into every other module in the repository. dnl -dnl Single-module modifications are best placed in configure.in for kdelibs -dnl and kdebase or configure.in.in if present. +dnl Single-module modifications are best placed in configure.in for tdelibs +dnl and tdebase or configure.in.in if present. # KDE_PATH_X_DIRECT dnl Internal subroutine of AC_PATH_X. @@ -103,41 +103,41 @@ ac_x_libraries=], [LIBS="$ac_save_LIBS" # First see if replacing the include by lib works. # Check X11 before X11Rn because it is often a symlink to the current release. -for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \ - /usr/X11/lib${kdelibsuff} \ - /usr/X11R6/lib${kdelibsuff} \ - /usr/X11R5/lib${kdelibsuff} \ - /usr/X11R4/lib${kdelibsuff} \ +for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \ + /usr/X11/lib${tdelibsuff} \ + /usr/X11R6/lib${tdelibsuff} \ + /usr/X11R5/lib${tdelibsuff} \ + /usr/X11R4/lib${tdelibsuff} \ \ - /usr/lib${kdelibsuff}/X11 \ - /usr/lib${kdelibsuff}/X11R6 \ - /usr/lib${kdelibsuff}/X11R5 \ - /usr/lib${kdelibsuff}/X11R4 \ + /usr/lib${tdelibsuff}/X11 \ + /usr/lib${tdelibsuff}/X11R6 \ + /usr/lib${tdelibsuff}/X11R5 \ + /usr/lib${tdelibsuff}/X11R4 \ \ - /usr/local/X11/lib${kdelibsuff} \ - /usr/local/X11R6/lib${kdelibsuff} \ - /usr/local/X11R5/lib${kdelibsuff} \ - /usr/local/X11R4/lib${kdelibsuff} \ + /usr/local/X11/lib${tdelibsuff} \ + /usr/local/X11R6/lib${tdelibsuff} \ + /usr/local/X11R5/lib${tdelibsuff} \ + /usr/local/X11R4/lib${tdelibsuff} \ \ - /usr/local/lib${kdelibsuff}/X11 \ - /usr/local/lib${kdelibsuff}/X11R6 \ - /usr/local/lib${kdelibsuff}/X11R5 \ - /usr/local/lib${kdelibsuff}/X11R4 \ + /usr/local/lib${tdelibsuff}/X11 \ + /usr/local/lib${tdelibsuff}/X11R6 \ + /usr/local/lib${tdelibsuff}/X11R5 \ + /usr/local/lib${tdelibsuff}/X11R4 \ \ - /usr/X386/lib${kdelibsuff} \ - /usr/x386/lib${kdelibsuff} \ - /usr/XFree86/lib${kdelibsuff}/X11 \ + /usr/X386/lib${tdelibsuff} \ + /usr/x386/lib${tdelibsuff} \ + /usr/XFree86/lib${tdelibsuff}/X11 \ \ - /usr/lib${kdelibsuff} \ - /usr/local/lib${kdelibsuff} \ - /usr/unsupported/lib${kdelibsuff} \ - /usr/athena/lib${kdelibsuff} \ - /usr/local/x11r5/lib${kdelibsuff} \ - /usr/lpp/Xamples/lib${kdelibsuff} \ - /lib/usr/lib${kdelibsuff}/X11 \ + /usr/lib${tdelibsuff} \ + /usr/local/lib${tdelibsuff} \ + /usr/unsupported/lib${tdelibsuff} \ + /usr/athena/lib${tdelibsuff} \ + /usr/local/x11r5/lib${tdelibsuff} \ + /usr/lpp/Xamples/lib${tdelibsuff} \ + /lib/usr/lib${tdelibsuff}/X11 \ \ - /usr/openwin/lib${kdelibsuff} \ - /usr/openwin/share/lib${kdelibsuff} \ + /usr/openwin/lib${tdelibsuff} \ + /usr/openwin/share/lib${tdelibsuff} \ ; \ do dnl Don't even attempt the hair of trying to link an X program! @@ -356,24 +356,24 @@ AC_DEFUN(KDE_1_CHECK_PATHS, fi AC_MSG_CHECKING([for KDE libraries installed]) -ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' +ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5' if AC_TRY_EVAL(ac_link) && test -s conftest; then AC_MSG_RESULT(yes) else AC_MSG_ERROR([your system fails at linking a small KDE application! Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and kdelibs as you did use now. +same compiler to compile Qt and tdelibs as you did use now. For more details about this problem, look at the end of config.log.]) fi -if eval `KDEDIR= ./conftest 2>&5`; then +if eval `TDEDIR= ./conftest 2>&5`; then kde_result=done else kde_result=problems fi -KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log +TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log kde_have_all_paths=yes KDE_SET_PATHS($kde_result) @@ -529,11 +529,11 @@ AC_DEFUN(KDE_SUBST_PROGRAMS, AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no") kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" - test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" - if test -n "$KDEDIRS"; then + test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs" + if test -n "$TDEDIRS"; then kde_save_IFS=$IFS IFS=: - for dir in $KDEDIRS; do + for dir in $TDEDIRS; do kde_default_bindirs="$dir/bin $kde_default_bindirs " done IFS=$kde_save_IFS @@ -545,16 +545,16 @@ AC_DEFUN(KDE_SUBST_PROGRAMS, KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)]) KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)]) fi - KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs]) + KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs]) KDE_FIND_PATH(brockenboring, BROCKENBORING, [$kde_default_bindirs]) if test -n "$BROCKENBORING"; then - KDE_FIND_PATH(kdeinit_wrapper, BROCKENBORING, [$kde_default_bindirs]) + KDE_FIND_PATH(tdeinit_wrapper, BROCKENBORING, [$kde_default_bindirs]) fi KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs]) if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share" - test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" + test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs" AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) if test "$KDE_XSL_STYLESHEET" = "NO"; then KDE_XSL_STYLESHEET="" @@ -577,9 +577,9 @@ AC_DEFUN(KDE_SUBST_PROGRAMS, if test -x "$KDECONFIG"; then # it can be "compiled" kde_libs_prefix=`$KDECONFIG --prefix` if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then - AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. + AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs. This means it has been moved since you installed it. - This won't work. Please recompile kdelibs for the new prefix. + This won't work. Please recompile tdelibs for the new prefix. ]) fi kde_libs_htmldir=`$KDECONFIG --install html --expandvars` @@ -659,7 +659,7 @@ AC_SUBST(kde_templatesdir) AC_SUBST(kde_servicesdir) AC_SUBST(kde_servicetypesdir) AC_SUBST(kde_moduledir) -AC_SUBST(kdeinitdir, '$(kde_moduledir)') +AC_SUBST(tdeinitdir, '$(kde_moduledir)') AC_SUBST(kde_styledir) AC_SUBST(kde_widgetdir) if test "$kde_qtver" = 1; then @@ -863,7 +863,7 @@ mips-sgi-irix6*) ac_x_includes="." fi if test -z "$ac_x_libraries"; then - ac_x_libraries="/usr/lib${kdelibsuff}" + ac_x_libraries="/usr/lib${tdelibsuff}" fi esac #from now on we use our own again @@ -1337,7 +1337,7 @@ qt_includes="" AC_ARG_WITH(qt-dir, [ --with-qt-dir=DIR where the root of Qt is installed ], [ ac_qt_includes="$withval"/include - ac_qt_libraries="$withval"/lib${kdelibsuff} + ac_qt_libraries="$withval"/lib${tdelibsuff} ac_qt_bindir="$withval"/bin ]) @@ -1378,7 +1378,7 @@ ac_qt_includes="$qt_incdir" qt_libdirs="" for dir in $kde_qt_dirs; do - qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" + qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir" done qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" if test ! "$ac_qt_libraries" = "NO"; then @@ -1547,7 +1547,7 @@ rm -f actest.ui actest.cpp AC_MSG_RESULT([$kde_cv_uic_plugins]) if test "$kde_cv_uic_plugins" != yes; then - AC_MSG_ERROR([you need to install kdelibs first.]) + AC_MSG_ERROR([you need to install tdelibs first.]) fi fi ]) @@ -1631,12 +1631,12 @@ if test "${prefix}" != NONE; then if test "${exec_prefix}" != NONE; then kde_libraries=${libdir} ac_kde_libraries=$libdir - if test "$ac_kde_libraries" = '${exec_prefix}/lib'${kdelibsuff}; then - ac_kde_libraries=$exec_prefix/lib${kdelibsuff} + if test "$ac_kde_libraries" = '${exec_prefix}/lib'${tdelibsuff}; then + ac_kde_libraries=$exec_prefix/lib${tdelibsuff} fi else - kde_libraries=${prefix}/lib${kdelibsuff} - ac_kde_libraries=$prefix/lib${kdelibsuff} + kde_libraries=${prefix}/lib${tdelibsuff} + ac_kde_libraries=$prefix/lib${tdelibsuff} fi else ac_kde_includes= @@ -1650,16 +1650,16 @@ AC_CACHE_VAL(ac_cv_have_kde, if test "$kde_qtver" = 1; then kde_check_header="ksock.h" - kde_check_lib="libkdecore.la" + kde_check_lib="libtdecore.la" else kde_check_header="ksharedptr.h" - kde_check_lib="libkio.la" + kde_check_lib="libtdeio.la" fi if test -z "$1"; then -kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" -test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" +kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" +test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs" AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) ac_kde_includes="$kde_incdir" @@ -1670,15 +1670,15 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail. So, check this please and use another prefix!]) fi -kde_libdirs="/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" -test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" +kde_libdirs="/usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}" +test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) ac_kde_libraries="$kde_libdir" kde_widgetdir=NO dnl this might be somewhere else -AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir) +AC_FIND_FILE("kde3/plugins/designer/tdewidgets.la", $kde_libdirs, kde_widgetdir) if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then AC_MSG_ERROR([ @@ -1686,10 +1686,10 @@ in the prefix, you've chosen, are no KDE libraries installed. This will fail. So, check this please and use another prefix!]) fi -if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then +if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/tdewidgets.la"; then AC_MSG_ERROR([ I can't find the designer plugins. These are required and should have been installed -by kdelibs]) +by tdelibs]) fi if test -n "$kde_widgetdir"; then @@ -1845,20 +1845,20 @@ cat > conftest.$ac_ext <<EOF #include <kapp.h> int main() { - printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); - printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); - printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); - printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); - printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); - printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); - printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); - printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); - printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); - printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); + printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data()); + printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data()); + printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data()); + printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data()); + printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data()); + printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data()); + printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data()); + printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data()); + printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data()); + printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data()); printf("kde_wallpaperdir=\\"%s\\"\n", - KApplication::kde_wallpaperdir().data()); - printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); - printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); + TDEApplication::kde_wallpaperdir().data()); + printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data()); + printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data()); printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n"); @@ -1892,7 +1892,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon, kde_cxxflags_safe="$CXXFLAGS" LIBS="-lkde-qt-addon $LIBQT $LIBS" - CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes" + CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes" LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" AC_TRY_LINK([ @@ -1956,37 +1956,37 @@ AC_DEFUN(KDE_CREATE_LIBS_ALIASES, AC_REQUIRE([K_PATH_X]) if test $kde_qtver = 3; then - AC_SUBST(LIB_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-lkio") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + AC_SUBST(LIB_TDEIO, "-ltdeio") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KABC, "-lkabc") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") - AC_SUBST(LIB_KDEPRINT, "-lkdeprint") + AC_SUBST(LIB_KABC, "-ltdeabc") + AC_SUBST(LIB_TDEHTML, "-ltdehtml") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") # these are for backward compatibility - AC_SUBST(LIB_KSYCOCA, "-lkio") - AC_SUBST(LIB_KFILE, "-lkio") + AC_SUBST(LIB_TDESYCOCA, "-ltdeio") + AC_SUBST(LIB_KFILE, "-ltdeio") elif test $kde_qtver = 2; then - AC_SUBST(LIB_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-lkio") - AC_SUBST(LIB_KSYCOCA, "-lksycoca") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + AC_SUBST(LIB_TDEIO, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-lkfile") + AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") - AC_SUBST(LIB_KDEPRINT, "-lkdeprint") + AC_SUBST(LIB_TDEHTML, "-ltdehtml") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else - AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)") - AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)") - AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)") - AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)") - AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") + AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") + AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") + AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") + AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) @@ -2051,7 +2051,7 @@ if test "x$kde_cv_func_$1" = xyes; then else case "$1" in setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) - kde_cv_proto_$1="yes - in libkdefakes" + kde_cv_proto_$1="yes - in libtdefakes" ;; *) kde_cv_proto_$1=unknown @@ -2327,7 +2327,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then AC_MSG_RESULT(yes) AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) else - AC_MSG_ERROR(You need giflib30. Please install the kdesupport package) + AC_MSG_ERROR(You need giflib30. Please install the tdesupport package) fi ]) @@ -2392,7 +2392,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir) test "x$jpeg_incdir" = xNO && jpeg_incdir= dnl if headers _and_ libraries are missing, this is no error, and we -dnl continue with a warning (the user will get no jpeg support in khtml) +dnl continue with a warning (the user will get no jpeg support in tdehtml) dnl if only one is missing, it means a configuration error, but we still dnl only warn if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then @@ -3014,26 +3014,26 @@ See http:://objprelink.sourceforge.net for details: AC_DEFUN(KDE_CHECK_LIB64, [ - kdelibsuff=none + tdelibsuff=none AC_ARG_ENABLE(libsuffix, AC_HELP_STRING([--enable-libsuffix], [/lib directory suffix (64,32,none[=default])]), - kdelibsuff=$enableval) + tdelibsuff=$enableval) # TODO: add an auto case that compiles a little C app to check # where the glibc is - if test "$kdelibsuff" = "none"; then - kdelibsuff= + if test "$tdelibsuff" = "none"; then + tdelibsuff= fi - if test -z "$kdelibsuff"; then + if test -z "$tdelibsuff"; then AC_MSG_RESULT([not using lib directory suffix]) AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories) else if test "$libdir" = '${exec_prefix}/lib'; then - libdir="$libdir${kdelibsuff}" + libdir="$libdir${tdelibsuff}" AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms fi - AC_DEFINE_UNQUOTED(KDELIBSUFF, ["\"${kdelibsuff}\""], Suffix for lib directories) - AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) + AC_DEFINE_UNQUOTED(KDELIBSUFF, ["\"${tdelibsuff}\""], Suffix for lib directories) + AC_MSG_RESULT([using lib directory suffix $tdelibsuff]) fi ]) @@ -3049,7 +3049,7 @@ AC_CANONICAL_SYSTEM AC_ARG_PROGRAM AM_INIT_AUTOMAKE($1, $2) AM_DISABLE_LIBRARIES -AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) +AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) AC_CHECK_COMPILERS KDE_PROG_LIBTOOL AM_KDE_WITH_NLS @@ -4608,8 +4608,8 @@ AC_DEFUN(KDE_CONF_FILES, AC_DEFUN(KDE_SET_PREFIX, [ unset CDPATH - dnl make $KDEDIR the default for the installation - AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) + dnl make $TDEDIR the default for the installation + AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) if test "x$prefix" = "xNONE"; then prefix=$ac_default_prefix @@ -5212,7 +5212,7 @@ ssl_includes="" AC_ARG_WITH(ssl-dir, [ --with-ssl-dir=DIR where the root of OpenSSL is installed], [ ac_ssl_includes="$withval"/include - ac_ssl_libraries="$withval"/lib$kdelibsuff + ac_ssl_libraries="$withval"/lib$tdelibsuff ]) want_ssl=yes @@ -5232,7 +5232,7 @@ AC_CACHE_VAL(ac_cv_have_ssl, AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir) ac_ssl_includes="$ssl_incdir" - ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs" + ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs" if test ! "$ac_ssl_libraries" = "NO"; then ssl_libdirs="$ac_ssl_libraries $ssl_libdirs" fi diff --git a/admin/am_edit b/admin/am_edit index 7425653..128b790 100644 --- a/admin/am_edit +++ b/admin/am_edit @@ -66,7 +66,7 @@ sub tag_NO_UNDEFINED(); sub tag_NMCHECK(); sub tag_NMCHECK_GLOBAL(); sub tag_DIST(); -sub tag_KDEINIT(); +sub tag_TDEINIT(); # Some global globals... $verbose = 0; # a debug flag @@ -332,7 +332,7 @@ sub processMakefile ($) make_meta_classes(); tag_COMPILE_FIRST(); tag_FINAL() if (!$kdeopts{"nofinal"}); - tag_KDEINIT(); + tag_TDEINIT(); my $final_lines = "final:\n\t\$(MAKE) "; my $final_install_lines = "final-install:\n\t\$(MAKE) "; @@ -810,25 +810,25 @@ sub tag_FINAL() } } -sub tag_KDEINIT() +sub tag_TDEINIT() { - my $lookup = 'kdeinit_LTLIBRARIES\s*=\s*(.*)'; + my $lookup = 'tdeinit_LTLIBRARIES\s*=\s*(.*)'; if ($MakefileData =~ m/\n$lookup\n/) { - my @kdeinits = split(/[\034\s]+/, $1); + my @tdeinits = split(/[\034\s]+/, $1); my $lines = ""; - foreach $kdeinit (@kdeinits) { - if ($kdeinit =~ m/\.la$/) { - $kdeinit =~ s/\.la$//; - $lines .= "\t\@-rm -f \$(DESTDIR)\$(bindir)/$kdeinit\n"; + foreach $tdeinit (@tdeinits) { + if ($tdeinit =~ m/\.la$/) { + $tdeinit =~ s/\.la$//; + $lines .= "\t\@-rm -f \$(DESTDIR)\$(bindir)/$tdeinit\n"; $lines .= "\t\@if test \"\$(BROCKENBORING)\" = \"\$(bindir)/brockenboring\"; then \\\n"; - $lines .= "\techo \$(LN_S) brockenboring \$(DESTDIR)\$(bindir)/$kdeinit ; \\\n"; - $lines .= "\t\$(LN_S) brockenboring \$(DESTDIR)\$(bindir)/$kdeinit ; else \\\n"; - $lines .= "\techo \$(LN_S) \$(BROCKENBORING) \$(DESTDIR)\$(bindir)/$kdeinit ;\\\n"; - $lines .= "\t\$(LN_S) \$(BROCKENBORING) \$(DESTDIR)\$(bindir)/$kdeinit ; fi\n"; + $lines .= "\techo \$(LN_S) brockenboring \$(DESTDIR)\$(bindir)/$tdeinit ; \\\n"; + $lines .= "\t\$(LN_S) brockenboring \$(DESTDIR)\$(bindir)/$tdeinit ; else \\\n"; + $lines .= "\techo \$(LN_S) \$(BROCKENBORING) \$(DESTDIR)\$(bindir)/$tdeinit ;\\\n"; + $lines .= "\t\$(LN_S) \$(BROCKENBORING) \$(DESTDIR)\$(bindir)/$tdeinit ; fi\n"; } } - $target_adds{"install-exec-am"} .= "install-kdeinit-links "; - $lines = "install-kdeinit-links:\n" . + $target_adds{"install-exec-am"} .= "install-tdeinit-links "; + $lines = "install-tdeinit-links:\n" . "\t\$(mkinstalldirs) \$(DESTDIR)\$(bindir)\n" . $lines; appendLines($lines); } @@ -1174,7 +1174,7 @@ sub tag_UIFILES () $dep_lines .= "$source.$cxxsuffix: $sourcedir$source.ui $source.h $source.moc\n"; $dep_lines .= "\trm -f $source.$cxxsuffix\n"; if (!$kdeopts{"qtonly"}) { - $dep_lines .= "\techo '#include <klocale.h>' > $source.$cxxsuffix\n"; + $dep_lines .= "\techo '#include <tdelocale.h>' > $source.$cxxsuffix\n"; my ($mangled_source) = $source; $mangled_source =~ s/[^A-Za-z0-9]/_/g; # get rid of garbage $dep_lines .= "\t\$(UIC) -tr \${UIC_TR} -i $source.h $sourcedir$source.ui > $source.$cxxsuffix.temp ; ret=\$\$?; \\\n"; @@ -1487,7 +1487,7 @@ sub tag_POFILES () $pofiles = join(" ", grep(/\.po$/, readdir(THISDIR))); closedir (THISDIR); print STDOUT "pofiles found = $pofiles\n" if ($verbose); - if (-f "charset" && -f "kdelibs.po") { + if (-f "charset" && -f "tdelibs.po") { handle_TOPLEVEL(); } } diff --git a/admin/config.pl b/admin/config.pl index 1af1cf2..80ecbf1 100644 --- a/admin/config.pl +++ b/admin/config.pl @@ -8,7 +8,7 @@ # has to recompile the regexps every time. # # this script does better. It changes all Makefile.ins in one process. -# in kdelibs the time for building Makefile went down from 2:59 min to 13 sec! +# in tdelibs the time for building Makefile went down from 2:59 min to 13 sec! # # written by Michael Matz <matz@kde.org> # adapted by Dirk Mueller <mueller@kde.org> diff --git a/admin/cvs.sh b/admin/cvs.sh index 80688bc..173eca7 100644 --- a/admin/cvs.sh +++ b/admin/cvs.sh @@ -509,14 +509,14 @@ for subdir in $dirs; do echo "$subdir has *.rc or *.ui files, but not correct messages line" fi fi - if test -n "`grep -r KAboutData *.c* *.C* 2>/dev/null`"; then + if test -n "`grep -r TDEAboutData *.c* *.C* 2>/dev/null`"; then echo -e 'i18n("_: NAME OF TRANSLATORS\\n"\n"Your names")\ni18n("_: EMAIL OF TRANSLATORS\\n"\n"Your emails")' > _translatorinfo.cpp else echo " " > _translatorinfo.cpp fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if|else|endif)\s/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" \ - XGETTEXT="${XGETTEXT:-xgettext} -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale -x ${includedir:-${KDEDIR:-/usr/local/kde}/include}/kde.pot" \ + XGETTEXT="${XGETTEXT:-xgettext} -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale -x ${includedir:-${TDEDIR:-/usr/local/kde}/include}/kde.pot" \ messages exit_code=$? if test "$exit_code" != 0; then diff --git a/admin/debianrules b/admin/debianrules index 6b0b06d..8143640 100755 --- a/admin/debianrules +++ b/admin/debianrules @@ -10,7 +10,7 @@ chomp $origPwd; $kde_confdir = "/etc/kde3"; $kde_prefix = "/usr"; $kde_bindir = "$kde_prefix/bin"; -$kde_includedir = "$kde_prefix/include/kde"; +$kde_includedir = "$kde_prefix/include/tde"; $kde_libdir = "$kde_prefix/lib"; $kde_cgidir = "$kde_prefix/lib/cgi-bin"; $kde_moduledir = "$kde_prefix/lib/kde3"; @@ -87,7 +87,7 @@ if (@ARGV && $ARGV[0] eq 'echodirs') { print STDOUT "export INSTALL_DATA=install -p -c -m 644\n"; print STDOUT "configkde=$enable_debug $enable_final --disable-rpath --prefix=\$(kde_prefix) --libexecdir=\$(kde_bindir) --sysconfdir=\$(sysconfdir) --libdir=\$(kde_libdir) --includedir=\$(kde_includedir) --with-qt-includes=/usr/include/qt3 --mandir=\$(mandir) --infodir=\$(infodir) --with-xinerama\n"; - print STDOUT "configkdevelop=$enable_debug $enable_final --disable-rpath --enable-docbase --enable-kdoc2 --libdir=\$(kde_libdir) --includedir=\$(kde_includedir) --with-qt-includes=/usr/include/qt3 --mandir=\$(mandir) --with-kdelibsdoc-dir=/usr/share/doc/kdelibs3-doc/html --with-xinerama\n"; + print STDOUT "configkdevelop=$enable_debug $enable_final --disable-rpath --enable-docbase --enable-kdoc2 --libdir=\$(kde_libdir) --includedir=\$(kde_includedir) --with-qt-includes=/usr/include/qt3 --mandir=\$(mandir) --with-tdelibsdoc-dir=/usr/share/doc/tdelibs3-doc/html --with-xinerama\n"; print STDOUT "configkdepim=$enable_debug $enable_final --disable-rpath --with-extra-includes=/usr/include/libpisock --enable-shared --prefix=\$(kde_prefix) --libexecdir=\$(kde_bindir) --with-qt-includes=/usr/include/qt3 --mandir=\$(mandir) --infodir=\$(infodir) --with-xinerama\n"; exit diff --git a/colorscheme/Makefile b/colorscheme/Makefile index 7e7e578..51ceb7d 100644 --- a/colorscheme/Makefile +++ b/colorscheme/Makefile @@ -106,7 +106,7 @@ JAR = @JAR@ JAVAC = @JAVAC@ JAVAH = @JAVAH@ JVMLIBS = @JVMLIBS@ -KDECONFIG = /opt/kde3/bin/kde-config +KDECONFIG = /opt/kde3/bin/tde-config KDE_EXTRA_RPATH = KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ KDE_HAVE_DOT = @KDE_HAVE_DOT@ @@ -151,18 +151,18 @@ LIBUTIL = -lutil LIBZ = -lz LIB_JASPER = @LIB_JASPER@ LIB_KAB = -lkab -LIB_KABC = -lkabc -LIB_KDECORE = -lkdecore -LIB_KDEPRINT = -lkdeprint -LIB_KDEUI = -lkdeui -LIB_KFILE = -lkio +LIB_KABC = -ltdeabc +LIB_TDECORE = -ltdecore +LIB_TDEPRINT = -ltdeprint +LIB_TDEUI = -ltdeui +LIB_KFILE = -ltdeio LIB_KFM = -LIB_KHTML = -lkhtml +LIB_TDEHTML = -ltdehtml LIB_KIMGIO = @LIB_KIMGIO@ -LIB_KIO = -lkio -LIB_KPARTS = -lkparts -LIB_KSPELL = -lkspell -LIB_KSYCOCA = -lkio +LIB_TDEIO = -ltdeio +LIB_TDEPARTS = -ltdeparts +LIB_TDESPELL = -ltdespell +LIB_TDESYCOCA = -ltdeio LIB_POLL = LIB_QPE = LIB_QT = -ltqt-mt $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread @@ -245,7 +245,7 @@ kde_styledir = ${libdir}/kde3/plugins/styles kde_templatesdir = ${prefix}/share/templates kde_wallpaperdir = ${prefix}/share/wallpapers kde_widgetdir = /opt/kde3/lib/kde3/plugins/designer -kdeinitdir = $(kde_moduledir) +tdeinitdir = $(kde_moduledir) micodir = @micodir@ qt_includes = /usr/lib/qt3/include qt_libraries = /usr/lib/qt3/lib @@ -253,7 +253,7 @@ x_includes = /usr/X11R6/include x_libraries = /usr/X11R6/lib xdg_appsdir = ${datadir}/applications xdg_directorydir = ${datadir}/desktop-directories -lnkdir = $(kde_datadir)/kdisplay/color-schemes +lnkdir = $(kde_datadir)/tdedisplay/color-schemes lnk_DATA = Mallory-1.0-Caramel.kcsrc Mallory-1.0-Double.Blue.kcsrc \ Mallory-1.0-Double.Grey.kcsrc Mallory-1.0-Flat.Blue.kcsrc Mallory-1.0-Flat.Green.kcsrc \ Mallory-1.0-Flat.Grey.kcsrc Mallory-1.0-Flat.Sands.kcsrc Mallory-1.0-Green.Halo.kcsrc \ diff --git a/colorscheme/Makefile.am b/colorscheme/Makefile.am index 46363b7..dc5f4f6 100644 --- a/colorscheme/Makefile.am +++ b/colorscheme/Makefile.am @@ -1,4 +1,4 @@ -lnkdir = $(kde_datadir)/kdisplay/color-schemes +lnkdir = $(kde_datadir)/tdedisplay/color-schemes lnk_DATA = Mallory-1.0-Caramel.kcsrc Mallory-1.0-Double.Blue.kcsrc \ Mallory-1.0-Double.Grey.kcsrc Mallory-1.0-Flat.Blue.kcsrc Mallory-1.0-Flat.Green.kcsrc \ Mallory-1.0-Flat.Grey.kcsrc Mallory-1.0-Flat.Sands.kcsrc Mallory-1.0-Green.Halo.kcsrc \ diff --git a/colorscheme/Makefile.in b/colorscheme/Makefile.in index e132bda..ec03198 100644 --- a/colorscheme/Makefile.in +++ b/colorscheme/Makefile.in @@ -151,17 +151,17 @@ LIBZ = @LIBZ@ LIB_JASPER = @LIB_JASPER@ LIB_KAB = @LIB_KAB@ LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ +LIB_TDECORE = @LIB_TDECORE@ +LIB_TDEPRINT = @LIB_TDEPRINT@ +LIB_TDEUI = @LIB_TDEUI@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ +LIB_TDEHTML = @LIB_TDEHTML@ LIB_KIMGIO = @LIB_KIMGIO@ -LIB_KIO = @LIB_KIO@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ +LIB_TDEIO = @LIB_TDEIO@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ @@ -244,7 +244,7 @@ kde_styledir = @kde_styledir@ kde_templatesdir = @kde_templatesdir@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ +tdeinitdir = @tdeinitdir@ micodir = @micodir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ @@ -252,7 +252,7 @@ x_includes = @x_includes@ x_libraries = @x_libraries@ xdg_appsdir = @xdg_appsdir@ xdg_directorydir = @xdg_directorydir@ -lnkdir = $(kde_datadir)/kdisplay/color-schemes +lnkdir = $(kde_datadir)/tdedisplay/color-schemes lnk_DATA = Mallory-1.0-Caramel.kcsrc Mallory-1.0-Double.Blue.kcsrc \ Mallory-1.0-Double.Grey.kcsrc Mallory-1.0-Flat.Blue.kcsrc Mallory-1.0-Flat.Green.kcsrc \ Mallory-1.0-Flat.Grey.kcsrc Mallory-1.0-Flat.Sands.kcsrc Mallory-1.0-Green.Halo.kcsrc \ @@ -670,7 +670,7 @@ configure: failed program was: | } configure:17772: result: no configure:17775: checking if strlcat needs custom prototype -configure:17879: result: yes - in libkdefakes +configure:17879: result: yes - in libtdefakes configure:17904: checking for strlcpy configure:17951: g++ -c -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic -W -Wpointer-arith -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -O2 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common -pedantic-errors conftest.cc >&5 conftest.cc: In function `int main()': @@ -722,7 +722,7 @@ configure: failed program was: | } configure:17992: result: no configure:17995: checking if strlcpy needs custom prototype -configure:18098: result: yes - in libkdefakes +configure:18098: result: yes - in libtdefakes configure:18128: checking for main in -lutil configure:18152: gcc -o conftest -ansi -W -Wall -pedantic -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -O2 -Wformat-security -Wmissing-format-attribute conftest.c -lutil >&5 configure:18158: $? = 0 @@ -1765,9 +1765,9 @@ configure:25195: result: yes configure:25198: checking for KDE configure: 25246: /opt/kde3/include/ksharedptr.h taking that -configure: 25276: /opt/kde3/lib/libkio.la +configure: 25276: /opt/kde3/lib/libtdeio.la taking that -configure: 25294: /opt/kde3/lib/kde3/plugins/designer/kdewidgets.la +configure: 25294: /opt/kde3/lib/kde3/plugins/designer/tdewidgets.la taking that configure:25367: result: libraries /opt/kde3/lib, headers /opt/kde3/include configure:25406: checking if UIC has KDE plugins available @@ -1784,8 +1784,8 @@ configure:26245: checking for mcopidl configure:26304: result: /opt/kde3/bin/mcopidl configure:26311: checking for artsc-config configure:26370: result: /opt/kde3/bin/artsc-config -configure:26378: checking for kde-config -configure:26429: result: /opt/kde3/bin/kde-config +configure:26378: checking for tde-config +configure:26429: result: /opt/kde3/bin/tde-config configure:26436: checking for brockenboring configure:26483: result: not found configure:26554: checking for meinproc @@ -1930,7 +1930,7 @@ kde_cv_path_artsc_config=/opt/kde3/bin/artsc-config kde_cv_path_brockenboring=NONE kde_cv_path_dcopidl=/opt/kde3/bin/dcopidl kde_cv_path_dcopidl2cpp=/opt/kde3/bin/dcopidl2cpp -kde_cv_path_kde_config=/opt/kde3/bin/kde-config +kde_cv_path_kde_config=/opt/kde3/bin/tde-config kde_cv_path_mcopidl=/opt/kde3/bin/mcopidl kde_cv_path_meinproc=/opt/kde3/bin/meinproc kde_cv_path_moc=/usr/lib/qt3/bin/moc @@ -1946,8 +1946,8 @@ kde_cv_prog_cxx_fno_common=yes kde_cv_prog_cxx_fno_exceptions=yes kde_cv_prog_uic_L=yes kde_cv_prog_uic_nounload=yes -kde_cv_proto_strlcat='yes - in libkdefakes' -kde_cv_proto_strlcpy='yes - in libkdefakes' +kde_cv_proto_strlcat='yes - in libtdefakes' +kde_cv_proto_strlcpy='yes - in libtdefakes' kde_cv_qt_direct=no kde_cv_qt_jpeg=no kde_cv_uic_plugins=yes @@ -2018,7 +2018,7 @@ INSTALL_DATA='${INSTALL} -m 644' INSTALL_PROGRAM='${INSTALL} $(INSTALL_STRIP_FLAG)' INSTALL_SCRIPT='${INSTALL}' INSTALL_STRIP_PROGRAM='${SHELL} $(install_sh) -c -s' -KDECONFIG='/opt/kde3/bin/kde-config' +KDECONFIG='/opt/kde3/bin/tde-config' KDE_EXTRA_RPATH='' KDE_INCLUDES='-I/opt/kde3/include' KDE_LDFLAGS='-L/opt/kde3/lib' @@ -2051,17 +2051,17 @@ LIBUCB='' LIBUTIL='-lutil' LIBZ='-lz' LIB_KAB='-lkab' -LIB_KABC='-lkabc' -LIB_KDECORE='-lkdecore' -LIB_KDEPRINT='-lkdeprint' -LIB_KDEUI='-lkdeui' -LIB_KFILE='-lkio' +LIB_KABC='-ltdeabc' +LIB_TDECORE='-ltdecore' +LIB_TDEPRINT='-ltdeprint' +LIB_TDEUI='-ltdeui' +LIB_KFILE='-ltdeio' LIB_KFM='' -LIB_KHTML='-lkhtml' -LIB_KIO='-lkio' -LIB_KPARTS='-lkparts' -LIB_KSPELL='-lkspell' -LIB_KSYCOCA='-lkio' +LIB_TDEHTML='-ltdehtml' +LIB_TDEIO='-ltdeio' +LIB_TDEPARTS='-ltdeparts' +LIB_TDESPELL='-ltdespell' +LIB_TDESYCOCA='-ltdeio' LIB_POLL='' LIB_QPE='' LIB_QT='-ltqt-mt $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread' @@ -2155,7 +2155,7 @@ kde_styledir='${libdir}/kde3/plugins/styles' kde_templatesdir='${prefix}/share/templates' kde_wallpaperdir='${prefix}/share/wallpapers' kde_widgetdir='/opt/kde3/lib/kde3/plugins/designer' -kdeinitdir='$(kde_moduledir)' +tdeinitdir='$(kde_moduledir)' libdir='${exec_prefix}/lib' libexecdir='${exec_prefix}/libexec' localstatedir='${prefix}/var' diff --git a/config.status b/config.status index 02bda46..e764887 100755 --- a/config.status +++ b/config.status @@ -612,7 +612,7 @@ s,@DCOPIDL2CPP@,/opt/kde3/bin/dcopidl2cpp,;t t s,@DCOP_DEPENDENCIES@,$(DCOPIDL),;t t s,@MCOPIDL@,/opt/kde3/bin/mcopidl,;t t s,@ARTSCCONFIG@,/opt/kde3/bin/artsc-config,;t t -s,@KDECONFIG@,/opt/kde3/bin/kde-config,;t t +s,@KDECONFIG@,/opt/kde3/bin/tde-config,;t t s,@BROCKENBORING@,,;t t s,@MEINPROC@,/opt/kde3/bin/meinproc,;t t s,@KDE_XSL_STYLESHEET@,/opt/kde3/share/apps/ksgmltools2/customization/kde-chunk.xsl,;t t @@ -634,21 +634,21 @@ s,@kde_templatesdir@,${prefix}/share/templates,;t t s,@kde_servicesdir@,${prefix}/share/services,;t t s,@kde_servicetypesdir@,${prefix}/share/servicetypes,;t t s,@kde_moduledir@,${libdir}/kde3,;t t -s,@kdeinitdir@,$(kde_moduledir),;t t +s,@tdeinitdir@,$(kde_moduledir),;t t s,@kde_styledir@,${libdir}/kde3/plugins/styles,;t t s,@kde_widgetdir@,/opt/kde3/lib/kde3/plugins/designer,;t t -s,@LIB_KDECORE@,-lkdecore,;t t -s,@LIB_KDEUI@,-lkdeui,;t t -s,@LIB_KIO@,-lkio,;t t +s,@LIB_TDECORE@,-ltdecore,;t t +s,@LIB_TDEUI@,-ltdeui,;t t +s,@LIB_TDEIO@,-ltdeio,;t t s,@LIB_SMB@,-lsmb,;t t s,@LIB_KAB@,-lkab,;t t -s,@LIB_KABC@,-lkabc,;t t -s,@LIB_KHTML@,-lkhtml,;t t -s,@LIB_KSPELL@,-lkspell,;t t -s,@LIB_KPARTS@,-lkparts,;t t -s,@LIB_KDEPRINT@,-lkdeprint,;t t -s,@LIB_KSYCOCA@,-lkio,;t t -s,@LIB_KFILE@,-lkio,;t t +s,@LIB_KABC@,-ltdeabc,;t t +s,@LIB_TDEHTML@,-ltdehtml,;t t +s,@LIB_TDESPELL@,-ltdespell,;t t +s,@LIB_TDEPARTS@,-ltdeparts,;t t +s,@LIB_TDEPRINT@,-ltdeprint,;t t +s,@LIB_TDESYCOCA@,-ltdeio,;t t +s,@LIB_KFILE@,-ltdeio,;t t s,@LIB_KFM@,,;t t s,@TOPSUBDIRS@, colorscheme malloryclient,;t t s,@LIBOBJS@,,;t t @@ -421,7 +421,7 @@ PACKAGE_STRING= PACKAGE_BUGREPORT= ac_unique_file="acinclude.m4" -ac_default_prefix=${KDEDIR:-/usr/local/kde} +ac_default_prefix=${TDEDIR:-/usr/local/kde} # Factoring default headers for most tests. ac_includes_default="\ #include <stdio.h> @@ -459,7 +459,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE WOVERLOADED_VIRTUAL USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE LN_S ECHO RANLIB ac_ct_RANLIB EGREP LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL X_INCLUDES X_LDFLAGS x_libraries x_includes LIBSM X_PRE_LIBS LIB_X11 QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG KDECONFIG BROCKENBORING MEINPROC KDE_XSL_STYLESHEET kde_libs_prefix kde_libs_htmldir kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KSYCOCA LIB_KFILE LIB_KFM TOPSUBDIRS LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE WOVERLOADED_VIRTUAL USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE LN_S ECHO RANLIB ac_ct_RANLIB EGREP LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL X_INCLUDES X_LDFLAGS x_libraries x_includes LIBSM X_PRE_LIBS LIB_X11 QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG KDECONFIG BROCKENBORING MEINPROC KDE_XSL_STYLESHEET kde_libs_prefix kde_libs_htmldir kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir tdeinitdir kde_styledir kde_widgetdir LIB_TDECORE LIB_TDEUI LIB_TDEIO LIB_SMB LIB_KAB LIB_KABC LIB_TDEHTML LIB_TDESPELL LIB_TDEPARTS LIB_TDEPRINT LIB_TDESYCOCA LIB_KFILE LIB_KFM TOPSUBDIRS LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -6164,18 +6164,18 @@ fi; - kdelibsuff=none + tdelibsuff=none # Check whether --enable-libsuffix or --disable-libsuffix was given. if test "${enable_libsuffix+set}" = set; then enableval="$enable_libsuffix" - kdelibsuff=$enableval + tdelibsuff=$enableval fi; # TODO: add an auto case that compiles a little C app to check # where the glibc is - if test "$kdelibsuff" = "none"; then - kdelibsuff= + if test "$tdelibsuff" = "none"; then + tdelibsuff= fi - if test -z "$kdelibsuff"; then + if test -z "$tdelibsuff"; then echo "$as_me:$LINENO: result: not using lib directory suffix" >&5 echo "${ECHO_T}not using lib directory suffix" >&6 @@ -6185,16 +6185,16 @@ _ACEOF else if test "$libdir" = '${exec_prefix}/lib'; then - libdir="$libdir${kdelibsuff}" + libdir="$libdir${tdelibsuff}" libdir="$libdir" fi cat >>confdefs.h <<_ACEOF -#define KDELIBSUFF "\"${kdelibsuff}\"" +#define KDELIBSUFF "\"${tdelibsuff}\"" _ACEOF - echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5 -echo "${ECHO_T}using lib directory suffix $kdelibsuff" >&6 + echo "$as_me:$LINENO: result: using lib directory suffix $tdelibsuff" >&5 +echo "${ECHO_T}using lib directory suffix $tdelibsuff" >&6 fi # Check whether --enable-fast-install or --disable-fast-install was given. @@ -17783,7 +17783,7 @@ if test "x$kde_cv_func_strlcat" = xyes; then else case "strlcat" in setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) - kde_cv_proto_strlcat="yes - in libkdefakes" + kde_cv_proto_strlcat="yes - in libtdefakes" ;; *) kde_cv_proto_strlcat=unknown @@ -18003,7 +18003,7 @@ if test "x$kde_cv_func_strlcpy" = xyes; then else case "strlcpy" in setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) - kde_cv_proto_strlcpy="yes - in libkdefakes" + kde_cv_proto_strlcpy="yes - in libtdefakes" ;; *) kde_cv_proto_strlcpy=unknown @@ -22849,41 +22849,41 @@ sed 's/^/| /' conftest.$ac_ext >&5 LIBS="$ac_save_LIBS" # First see if replacing the include by lib works. # Check X11 before X11Rn because it is often a symlink to the current release. -for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \ - /usr/X11/lib${kdelibsuff} \ - /usr/X11R6/lib${kdelibsuff} \ - /usr/X11R5/lib${kdelibsuff} \ - /usr/X11R4/lib${kdelibsuff} \ +for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \ + /usr/X11/lib${tdelibsuff} \ + /usr/X11R6/lib${tdelibsuff} \ + /usr/X11R5/lib${tdelibsuff} \ + /usr/X11R4/lib${tdelibsuff} \ \ - /usr/lib${kdelibsuff}/X11 \ - /usr/lib${kdelibsuff}/X11R6 \ - /usr/lib${kdelibsuff}/X11R5 \ - /usr/lib${kdelibsuff}/X11R4 \ + /usr/lib${tdelibsuff}/X11 \ + /usr/lib${tdelibsuff}/X11R6 \ + /usr/lib${tdelibsuff}/X11R5 \ + /usr/lib${tdelibsuff}/X11R4 \ \ - /usr/local/X11/lib${kdelibsuff} \ - /usr/local/X11R6/lib${kdelibsuff} \ - /usr/local/X11R5/lib${kdelibsuff} \ - /usr/local/X11R4/lib${kdelibsuff} \ + /usr/local/X11/lib${tdelibsuff} \ + /usr/local/X11R6/lib${tdelibsuff} \ + /usr/local/X11R5/lib${tdelibsuff} \ + /usr/local/X11R4/lib${tdelibsuff} \ \ - /usr/local/lib${kdelibsuff}/X11 \ - /usr/local/lib${kdelibsuff}/X11R6 \ - /usr/local/lib${kdelibsuff}/X11R5 \ - /usr/local/lib${kdelibsuff}/X11R4 \ + /usr/local/lib${tdelibsuff}/X11 \ + /usr/local/lib${tdelibsuff}/X11R6 \ + /usr/local/lib${tdelibsuff}/X11R5 \ + /usr/local/lib${tdelibsuff}/X11R4 \ \ - /usr/X386/lib${kdelibsuff} \ - /usr/x386/lib${kdelibsuff} \ - /usr/XFree86/lib${kdelibsuff}/X11 \ + /usr/X386/lib${tdelibsuff} \ + /usr/x386/lib${tdelibsuff} \ + /usr/XFree86/lib${tdelibsuff}/X11 \ \ - /usr/lib${kdelibsuff} \ - /usr/local/lib${kdelibsuff} \ - /usr/unsupported/lib${kdelibsuff} \ - /usr/athena/lib${kdelibsuff} \ - /usr/local/x11r5/lib${kdelibsuff} \ - /usr/lpp/Xamples/lib${kdelibsuff} \ - /lib/usr/lib${kdelibsuff}/X11 \ + /usr/lib${tdelibsuff} \ + /usr/local/lib${tdelibsuff} \ + /usr/unsupported/lib${tdelibsuff} \ + /usr/athena/lib${tdelibsuff} \ + /usr/local/x11r5/lib${tdelibsuff} \ + /usr/lpp/Xamples/lib${tdelibsuff} \ + /lib/usr/lib${tdelibsuff}/X11 \ \ - /usr/openwin/lib${kdelibsuff} \ - /usr/openwin/share/lib${kdelibsuff} \ + /usr/openwin/lib${tdelibsuff} \ + /usr/openwin/share/lib${tdelibsuff} \ ; \ do for ac_extension in a so sl; do @@ -22942,7 +22942,7 @@ fi ac_x_includes="." fi if test -z "$ac_x_libraries"; then - ac_x_libraries="/usr/lib${kdelibsuff}" + ac_x_libraries="/usr/lib${tdelibsuff}" fi esac #from now on we use our own again @@ -24386,7 +24386,7 @@ qt_includes="" if test "${with_qt_dir+set}" = set; then withval="$with_qt_dir" ac_qt_includes="$withval"/include - ac_qt_libraries="$withval"/lib${kdelibsuff} + ac_qt_libraries="$withval"/lib${tdelibsuff} ac_qt_bindir="$withval"/bin fi; @@ -24450,7 +24450,7 @@ ac_qt_includes="$qt_incdir" qt_libdirs="" for dir in $kde_qt_dirs; do - qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" + qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir" done qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" if test ! "$ac_qt_libraries" = "NO"; then @@ -25205,12 +25205,12 @@ if test "${prefix}" != NONE; then if test "${exec_prefix}" != NONE; then kde_libraries=${libdir} ac_kde_libraries=$libdir - if test "$ac_kde_libraries" = '${exec_prefix}/lib'${kdelibsuff}; then - ac_kde_libraries=$exec_prefix/lib${kdelibsuff} + if test "$ac_kde_libraries" = '${exec_prefix}/lib'${tdelibsuff}; then + ac_kde_libraries=$exec_prefix/lib${tdelibsuff} fi else - kde_libraries=${prefix}/lib${kdelibsuff} - ac_kde_libraries=$prefix/lib${kdelibsuff} + kde_libraries=${prefix}/lib${tdelibsuff} + ac_kde_libraries=$prefix/lib${tdelibsuff} fi else ac_kde_includes= @@ -25226,16 +25226,16 @@ else if test "$kde_qtver" = 1; then kde_check_header="ksock.h" - kde_check_lib="libkdecore.la" + kde_check_lib="libtdecore.la" else kde_check_header="ksharedptr.h" - kde_check_lib="libkio.la" + kde_check_lib="libtdeio.la" fi if test -z ""; then -kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" -test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" +kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" +test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs" kde_incdir=NO @@ -25264,8 +25264,8 @@ So, check this please and use another prefix!" >&2;} { (exit 1); exit 1; }; } fi -kde_libdirs="/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" -test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" +kde_libdirs="/usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}" +test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" kde_libdir=NO @@ -25289,7 +25289,7 @@ kde_widgetdir=NO kde_widgetdir=NO for i in $kde_libdirs; do - for j in "kde3/plugins/designer/kdewidgets.la"; + for j in "kde3/plugins/designer/tdewidgets.la"; do echo "configure: 25294: $i/$j" >&5 if test -r "$i/$j"; then @@ -25311,13 +25311,13 @@ So, check this please and use another prefix!" >&2;} { (exit 1); exit 1; }; } fi -if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then +if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/tdewidgets.la"; then { { echo "$as_me:$LINENO: error: I can't find the designer plugins. These are required and should have been installed -by kdelibs" >&5 +by tdelibs" >&5 echo "$as_me: error: I can't find the designer plugins. These are required and should have been installed -by kdelibs" >&2;} +by tdelibs" >&2;} { (exit 1); exit 1; }; } fi @@ -25447,8 +25447,8 @@ fi echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5 echo "${ECHO_T}$kde_cv_uic_plugins" >&6 if test "$kde_cv_uic_plugins" != yes; then - { { echo "$as_me:$LINENO: error: you need to install kdelibs first." >&5 -echo "$as_me: error: you need to install kdelibs first." >&2;} + { { echo "$as_me:$LINENO: error: you need to install tdelibs first." >&5 +echo "$as_me: error: you need to install tdelibs first." >&2;} { (exit 1); exit 1; }; } fi fi @@ -25613,20 +25613,20 @@ cat > conftest.$ac_ext <<EOF #include <kapp.h> int main() { - printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); - printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); - printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); - printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); - printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); - printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); - printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); - printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); - printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); - printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); + printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data()); + printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data()); + printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data()); + printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data()); + printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data()); + printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data()); + printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data()); + printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data()); + printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data()); + printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data()); printf("kde_wallpaperdir=\\"%s\\"\n", - KApplication::kde_wallpaperdir().data()); - printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); - printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); + TDEApplication::kde_wallpaperdir().data()); + printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data()); + printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data()); printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n"); @@ -25685,7 +25685,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu echo "$as_me:$LINENO: checking for KDE libraries installed" >&5 echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6 -ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' +ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5' if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 @@ -25697,22 +25697,22 @@ echo "${ECHO_T}yes" >&6 else { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application! Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and kdelibs as you did use now. +same compiler to compile Qt and tdelibs as you did use now. For more details about this problem, look at the end of config.log." >&5 echo "$as_me: error: your system fails at linking a small KDE application! Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and kdelibs as you did use now. +same compiler to compile Qt and tdelibs as you did use now. For more details about this problem, look at the end of config.log." >&2;} { (exit 1); exit 1; }; } fi -if eval `KDEDIR= ./conftest 2>&5`; then +if eval `TDEDIR= ./conftest 2>&5`; then kde_result=done else kde_result=problems fi -KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log +TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log kde_have_all_paths=yes @@ -25901,20 +25901,20 @@ cat > conftest.$ac_ext <<EOF #include <kapp.h> int main() { - printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); - printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); - printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); - printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); - printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); - printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); - printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); - printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); - printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); - printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); + printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data()); + printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data()); + printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data()); + printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data()); + printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data()); + printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data()); + printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data()); + printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data()); + printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data()); + printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data()); printf("kde_wallpaperdir=\\"%s\\"\n", - KApplication::kde_wallpaperdir().data()); - printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); - printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); + TDEApplication::kde_wallpaperdir().data()); + printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data()); + printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data()); printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n"); @@ -25973,7 +25973,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu echo "$as_me:$LINENO: checking for KDE libraries installed" >&5 echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6 -ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' +ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5' if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 @@ -25985,22 +25985,22 @@ echo "${ECHO_T}yes" >&6 else { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application! Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and kdelibs as you did use now. +same compiler to compile Qt and tdelibs as you did use now. For more details about this problem, look at the end of config.log." >&5 echo "$as_me: error: your system fails at linking a small KDE application! Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and kdelibs as you did use now. +same compiler to compile Qt and tdelibs as you did use now. For more details about this problem, look at the end of config.log." >&2;} { (exit 1); exit 1; }; } fi -if eval `KDEDIR= ./conftest 2>&5`; then +if eval `TDEDIR= ./conftest 2>&5`; then kde_result=done else kde_result=problems fi -KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log +TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log kde_have_all_paths=yes @@ -26098,11 +26098,11 @@ fi kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" - test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" - if test -n "$KDEDIRS"; then + test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs" + if test -n "$TDEDIRS"; then kde_save_IFS=$IFS IFS=: - for dir in $KDEDIRS; do + for dir in $TDEDIRS; do kde_default_bindirs="$dir/bin $kde_default_bindirs " done IFS=$kde_save_IFS @@ -26375,12 +26375,12 @@ echo "${ECHO_T}$kde_cv_path" >&6 fi - echo "$as_me:$LINENO: checking for kde-config" >&5 -echo $ECHO_N "checking for kde-config... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for tde-config" >&5 +echo $ECHO_N "checking for tde-config... $ECHO_C" >&6 if test -n "$KDECONFIG"; then kde_cv_path="$KDECONFIG"; else - kde_cache=`echo kde-config | sed 'y%./+-%__p_%'` + kde_cache=`echo tde-config | sed 'y%./+-%__p_%'` if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -26396,16 +26396,16 @@ else IFS=$kde_save_IFS for dir in $dirs; do - if test -x "$dir/kde-config"; then + if test -x "$dir/tde-config"; then if test -n "" then - evalstr="$dir/kde-config 2>&1 " + evalstr="$dir/tde-config 2>&1 " if eval $evalstr; then - kde_cv_path="$dir/kde-config" + kde_cv_path="$dir/tde-config" break fi else - kde_cv_path="$dir/kde-config" + kde_cv_path="$dir/tde-config" break fi fi @@ -26492,12 +26492,12 @@ echo "${ECHO_T}$kde_cv_path" >&6 if test -n "$BROCKENBORING"; then - echo "$as_me:$LINENO: checking for kdeinit_wrapper" >&5 -echo $ECHO_N "checking for kdeinit_wrapper... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for tdeinit_wrapper" >&5 +echo $ECHO_N "checking for tdeinit_wrapper... $ECHO_C" >&6 if test -n "$BROCKENBORING"; then kde_cv_path="$BROCKENBORING"; else - kde_cache=`echo kdeinit_wrapper | sed 'y%./+-%__p_%'` + kde_cache=`echo tdeinit_wrapper | sed 'y%./+-%__p_%'` if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -26513,16 +26513,16 @@ else IFS=$kde_save_IFS for dir in $dirs; do - if test -x "$dir/kdeinit_wrapper"; then + if test -x "$dir/tdeinit_wrapper"; then if test -n "" then - evalstr="$dir/kdeinit_wrapper 2>&1 " + evalstr="$dir/tdeinit_wrapper 2>&1 " if eval $evalstr; then - kde_cv_path="$dir/kdeinit_wrapper" + kde_cv_path="$dir/tdeinit_wrapper" break fi else - kde_cv_path="$dir/kdeinit_wrapper" + kde_cv_path="$dir/tdeinit_wrapper" break fi fi @@ -26611,7 +26611,7 @@ echo "${ECHO_T}$kde_cv_path" >&6 if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share" - test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" + test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs" KDE_XSL_STYLESHEET=NO for i in $kde_sharedirs; @@ -26648,13 +26648,13 @@ done if test -x "$KDECONFIG"; then # it can be "compiled" kde_libs_prefix=`$KDECONFIG --prefix` if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then - { { echo "$as_me:$LINENO: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. + { { echo "$as_me:$LINENO: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs. This means it has been moved since you installed it. - This won't work. Please recompile kdelibs for the new prefix. + This won't work. Please recompile tdelibs for the new prefix. " >&5 -echo "$as_me: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. +echo "$as_me: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs. This means it has been moved since you installed it. - This won't work. Please recompile kdelibs for the new prefix. + This won't work. Please recompile tdelibs for the new prefix. " >&2;} { (exit 1); exit 1; }; } fi @@ -26686,7 +26686,7 @@ echo "$as_me: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_ -kdeinitdir='$(kde_moduledir)' +tdeinitdir='$(kde_moduledir)' @@ -26704,64 +26704,64 @@ fi if test $kde_qtver = 3; then - LIB_KDECORE="-lkdecore" + LIB_TDECORE="-ltdecore" - LIB_KDEUI="-lkdeui" + LIB_TDEUI="-ltdeui" - LIB_KIO="-lkio" + LIB_TDEIO="-ltdeio" LIB_SMB="-lsmb" LIB_KAB="-lkab" - LIB_KABC="-lkabc" + LIB_KABC="-ltdeabc" - LIB_KHTML="-lkhtml" + LIB_TDEHTML="-ltdehtml" - LIB_KSPELL="-lkspell" + LIB_TDESPELL="-ltdespell" - LIB_KPARTS="-lkparts" + LIB_TDEPARTS="-ltdeparts" - LIB_KDEPRINT="-lkdeprint" + LIB_TDEPRINT="-ltdeprint" # these are for backward compatibility - LIB_KSYCOCA="-lkio" + LIB_TDESYCOCA="-ltdeio" - LIB_KFILE="-lkio" + LIB_KFILE="-ltdeio" elif test $kde_qtver = 2; then - LIB_KDECORE="-lkdecore" + LIB_TDECORE="-ltdecore" - LIB_KDEUI="-lkdeui" + LIB_TDEUI="-ltdeui" - LIB_KIO="-lkio" + LIB_TDEIO="-ltdeio" - LIB_KSYCOCA="-lksycoca" + LIB_TDESYCOCA="-ltdesycoca" LIB_SMB="-lsmb" - LIB_KFILE="-lkfile" + LIB_KFILE="-ltdefile" LIB_KAB="-lkab" - LIB_KHTML="-lkhtml" + LIB_TDEHTML="-ltdehtml" - LIB_KSPELL="-lkspell" + LIB_TDESPELL="-ltdespell" - LIB_KPARTS="-lkparts" + LIB_TDEPARTS="-ltdeparts" - LIB_KDEPRINT="-lkdeprint" + LIB_TDEPRINT="-ltdeprint" else - LIB_KDECORE="-lkdecore -lXext $(LIB_QT)" + LIB_TDECORE="-ltdecore -lXext $(LIB_QT)" - LIB_KDEUI="-lkdeui $(LIB_KDECORE)" + LIB_TDEUI="-ltdeui $(LIB_TDECORE)" - LIB_KFM="-lkfm $(LIB_KDECORE)" + LIB_KFM="-lkfm $(LIB_TDECORE)" - LIB_KFILE="-lkfile $(LIB_KFM) $(LIB_KDEUI)" + LIB_KFILE="-ltdefile $(LIB_KFM) $(LIB_TDEUI)" - LIB_KAB="-lkab $(LIB_KIMGIO) $(LIB_KDECORE)" + LIB_KAB="-lkab $(LIB_KIMGIO) $(LIB_TDECORE)" fi @@ -27610,20 +27610,20 @@ s,@kde_templatesdir@,$kde_templatesdir,;t t s,@kde_servicesdir@,$kde_servicesdir,;t t s,@kde_servicetypesdir@,$kde_servicetypesdir,;t t s,@kde_moduledir@,$kde_moduledir,;t t -s,@kdeinitdir@,$kdeinitdir,;t t +s,@tdeinitdir@,$tdeinitdir,;t t s,@kde_styledir@,$kde_styledir,;t t s,@kde_widgetdir@,$kde_widgetdir,;t t -s,@LIB_KDECORE@,$LIB_KDECORE,;t t -s,@LIB_KDEUI@,$LIB_KDEUI,;t t -s,@LIB_KIO@,$LIB_KIO,;t t +s,@LIB_TDECORE@,$LIB_TDECORE,;t t +s,@LIB_TDEUI@,$LIB_TDEUI,;t t +s,@LIB_TDEIO@,$LIB_TDEIO,;t t s,@LIB_SMB@,$LIB_SMB,;t t s,@LIB_KAB@,$LIB_KAB,;t t s,@LIB_KABC@,$LIB_KABC,;t t -s,@LIB_KHTML@,$LIB_KHTML,;t t -s,@LIB_KSPELL@,$LIB_KSPELL,;t t -s,@LIB_KPARTS@,$LIB_KPARTS,;t t -s,@LIB_KDEPRINT@,$LIB_KDEPRINT,;t t -s,@LIB_KSYCOCA@,$LIB_KSYCOCA,;t t +s,@LIB_TDEHTML@,$LIB_TDEHTML,;t t +s,@LIB_TDESPELL@,$LIB_TDESPELL,;t t +s,@LIB_TDEPARTS@,$LIB_TDEPARTS,;t t +s,@LIB_TDEPRINT@,$LIB_TDEPRINT,;t t +s,@LIB_TDESYCOCA@,$LIB_TDESYCOCA,;t t s,@LIB_KFILE@,$LIB_KFILE,;t t s,@LIB_KFM@,$LIB_KFM,;t t s,@TOPSUBDIRS@,$TOPSUBDIRS,;t t diff --git a/malloryclient/.deps/mallorybutton.Plo b/malloryclient/.deps/mallorybutton.Plo index 412d6b5..1f8f81c 100644 --- a/malloryclient/.deps/mallorybutton.Plo +++ b/malloryclient/.deps/mallorybutton.Plo @@ -116,13 +116,13 @@ mallorybutton.lo .libs/mallorybutton.o: mallorybutton.cpp \ /usr/lib/qt3/include/ntqwmatrix.h /usr/lib/qt3/include/ntqpixmap.h enums.h \ mallorybutton.h /usr/lib/qt3/include/ntqbutton.h \ /usr/lib/qt3/include/ntqkeysequence.h malloryclient.h \ - /opt/kde3/include/kdecoration.h /usr/lib/qt3/include/ntqiconset.h \ - /opt/kde3/include/netwm_def.h /opt/kde3/include/kdelibs_export.h \ - /opt/kde3/include/kdemacros.h /opt/kde3/include/kdeversion.h \ - /opt/kde3/include/kdecorationfactory.h /usr/lib/qt3/include/ntqlayout.h \ - malloryhandler.h /opt/kde3/include/kconfig.h \ - /opt/kde3/include/kconfigbase.h /usr/lib/qt3/include/ntqdatetime.h \ - /usr/lib/qt3/include/ntqvariant.h /opt/kde3/include/kconfigdata.h \ + /opt/kde3/include/tdecoration.h /usr/lib/qt3/include/ntqiconset.h \ + /opt/kde3/include/netwm_def.h /opt/kde3/include/tdelibs_export.h \ + /opt/kde3/include/tdemacros.h /opt/kde3/include/tdeversion.h \ + /opt/kde3/include/tdecorationfactory.h /usr/lib/qt3/include/ntqlayout.h \ + malloryhandler.h /opt/kde3/include/tdeconfig.h \ + /opt/kde3/include/tdeconfigbase.h /usr/lib/qt3/include/ntqdatetime.h \ + /usr/lib/qt3/include/ntqvariant.h /opt/kde3/include/tdeconfigdata.h \ /opt/kde3/include/klockfile.h /opt/kde3/include/ksharedptr.h pixmaps.h \ /usr/lib/qt3/include/ntqimage.h embeddata.h /usr/lib/qt3/include/ntqdict.h \ /usr/lib/qt3/include/ntqgdict.h /usr/lib/qt3/include/ntqdragobject.h \ @@ -551,33 +551,33 @@ mallorybutton.h: malloryclient.h: -/opt/kde3/include/kdecoration.h: +/opt/kde3/include/tdecoration.h: /usr/lib/qt3/include/ntqiconset.h: /opt/kde3/include/netwm_def.h: -/opt/kde3/include/kdelibs_export.h: +/opt/kde3/include/tdelibs_export.h: -/opt/kde3/include/kdemacros.h: +/opt/kde3/include/tdemacros.h: -/opt/kde3/include/kdeversion.h: +/opt/kde3/include/tdeversion.h: -/opt/kde3/include/kdecorationfactory.h: +/opt/kde3/include/tdecorationfactory.h: /usr/lib/qt3/include/ntqlayout.h: malloryhandler.h: -/opt/kde3/include/kconfig.h: +/opt/kde3/include/tdeconfig.h: -/opt/kde3/include/kconfigbase.h: +/opt/kde3/include/tdeconfigbase.h: /usr/lib/qt3/include/ntqdatetime.h: /usr/lib/qt3/include/ntqvariant.h: -/opt/kde3/include/kconfigdata.h: +/opt/kde3/include/tdeconfigdata.h: /opt/kde3/include/klockfile.h: diff --git a/malloryclient/.deps/malloryclient.Plo b/malloryclient/.deps/malloryclient.Plo index 38a8a6f..5fc0961 100644 --- a/malloryclient/.deps/malloryclient.Plo +++ b/malloryclient/.deps/malloryclient.Plo @@ -1,5 +1,5 @@ malloryclient.lo .libs/malloryclient.o: malloryclient.cpp \ - /opt/kde3/include/klocale.h /usr/lib/qt3/include/ntqstring.h \ + /opt/kde3/include/tdelocale.h /usr/lib/qt3/include/ntqstring.h \ /usr/lib/qt3/include/ntqcstring.h /usr/lib/qt3/include/ntqmemarray.h \ /usr/lib/qt3/include/ntqgarray.h /usr/lib/qt3/include/ntqshared.h \ /usr/lib/qt3/include/ntqglobal.h /usr/lib/qt3/include/ntqconfig.h \ @@ -67,7 +67,7 @@ malloryclient.lo .libs/malloryclient.o: malloryclient.cpp \ /usr/include/g++/bits/stl_algo.h /usr/include/g++/bits/stl_heap.h \ /usr/include/g++/bits/stl_tempbuf.h \ /usr/include/g++/bits/basic_string.tcc \ - /opt/kde3/include/kdelibs_export.h /opt/kde3/include/kdemacros.h \ + /opt/kde3/include/tdelibs_export.h /opt/kde3/include/tdemacros.h \ /opt/kde3/include/kpixmap.h /usr/lib/qt3/include/ntqpixmap.h \ /usr/lib/qt3/include/ntqpaintdevice.h /usr/lib/qt3/include/ntqwindowdefs.h \ /usr/lib/qt3/include/ntqobjectdefs.h /usr/lib/qt3/include/ntqnamespace.h \ @@ -119,14 +119,14 @@ malloryclient.lo .libs/malloryclient.o: malloryclient.cpp \ /usr/lib/qt3/include/ntqpainter.h /usr/lib/qt3/include/ntqpen.h \ /usr/lib/qt3/include/ntqpointarray.h /usr/lib/qt3/include/ntqwmatrix.h \ /usr/lib/qt3/include/ntqimage.h /usr/lib/qt3/include/ntqtooltip.h \ - malloryclient.h /opt/kde3/include/kdecoration.h \ + malloryclient.h /opt/kde3/include/tdecoration.h \ /usr/lib/qt3/include/ntqiconset.h /opt/kde3/include/netwm_def.h \ - /opt/kde3/include/kdeversion.h /opt/kde3/include/kdecorationfactory.h \ + /opt/kde3/include/tdeversion.h /opt/kde3/include/tdecorationfactory.h \ mallorybutton.h /usr/lib/qt3/include/ntqbutton.h \ /usr/lib/qt3/include/ntqkeysequence.h enums.h malloryhandler.h \ - /opt/kde3/include/kconfig.h /opt/kde3/include/kconfigbase.h \ + /opt/kde3/include/tdeconfig.h /opt/kde3/include/tdeconfigbase.h \ /usr/lib/qt3/include/ntqdatetime.h /usr/lib/qt3/include/ntqvariant.h \ - /opt/kde3/include/kconfigdata.h /opt/kde3/include/klockfile.h \ + /opt/kde3/include/tdeconfigdata.h /opt/kde3/include/klockfile.h \ /opt/kde3/include/ksharedptr.h pixmaps.h malloryclient.moc \ /usr/lib/qt3/include/ntqmetaobject.h /usr/lib/qt3/include/ntqconnection.h \ /usr/lib/qt3/include/ntqapplication.h \ @@ -135,7 +135,7 @@ malloryclient.lo .libs/malloryclient.o: malloryclient.cpp \ /usr/lib/qt3/include/private/qucomextra_p.h \ /usr/lib/qt3/include/private/qucom_p.h /usr/lib/qt3/include/ntquuid.h -/opt/kde3/include/klocale.h: +/opt/kde3/include/tdelocale.h: /usr/lib/qt3/include/ntqstring.h: @@ -365,9 +365,9 @@ malloryclient.lo .libs/malloryclient.o: malloryclient.cpp \ /usr/include/g++/bits/basic_string.tcc: -/opt/kde3/include/kdelibs_export.h: +/opt/kde3/include/tdelibs_export.h: -/opt/kde3/include/kdemacros.h: +/opt/kde3/include/tdemacros.h: /opt/kde3/include/kpixmap.h: @@ -565,15 +565,15 @@ malloryclient.lo .libs/malloryclient.o: malloryclient.cpp \ malloryclient.h: -/opt/kde3/include/kdecoration.h: +/opt/kde3/include/tdecoration.h: /usr/lib/qt3/include/ntqiconset.h: /opt/kde3/include/netwm_def.h: -/opt/kde3/include/kdeversion.h: +/opt/kde3/include/tdeversion.h: -/opt/kde3/include/kdecorationfactory.h: +/opt/kde3/include/tdecorationfactory.h: mallorybutton.h: @@ -585,15 +585,15 @@ enums.h: malloryhandler.h: -/opt/kde3/include/kconfig.h: +/opt/kde3/include/tdeconfig.h: -/opt/kde3/include/kconfigbase.h: +/opt/kde3/include/tdeconfigbase.h: /usr/lib/qt3/include/ntqdatetime.h: /usr/lib/qt3/include/ntqvariant.h: -/opt/kde3/include/kconfigdata.h: +/opt/kde3/include/tdeconfigdata.h: /opt/kde3/include/klockfile.h: diff --git a/malloryclient/.deps/malloryhandler.Plo b/malloryclient/.deps/malloryhandler.Plo index 6882289..7b6c577 100644 --- a/malloryclient/.deps/malloryhandler.Plo +++ b/malloryclient/.deps/malloryhandler.Plo @@ -1,6 +1,6 @@ malloryhandler.lo .libs/malloryhandler.o: malloryhandler.cpp \ - malloryhandler.h /opt/kde3/include/kdecorationfactory.h \ - /opt/kde3/include/kdecoration.h /usr/lib/qt3/include/ntqcolor.h \ + malloryhandler.h /opt/kde3/include/tdecorationfactory.h \ + /opt/kde3/include/tdecoration.h /usr/lib/qt3/include/ntqcolor.h \ /usr/lib/qt3/include/ntqwindowdefs.h /usr/lib/qt3/include/ntqobjectdefs.h \ /usr/lib/qt3/include/ntqglobal.h /usr/lib/qt3/include/ntqconfig.h \ /usr/lib/qt3/include/ntqmodules.h /usr/lib/qt3/include/ntqfeatures.h \ @@ -111,10 +111,10 @@ malloryhandler.lo .libs/malloryhandler.o: malloryhandler.cpp \ /usr/include/g++/bits/stl_map.h /usr/include/g++/bits/stl_multimap.h \ /usr/lib/qt3/include/ntqiconset.h /usr/lib/qt3/include/ntqpixmap.h \ /usr/lib/qt3/include/ntqpaintdevice.h /opt/kde3/include/netwm_def.h \ - /opt/kde3/include/kdelibs_export.h /opt/kde3/include/kdemacros.h \ - /opt/kde3/include/kdeversion.h /opt/kde3/include/kconfig.h \ - /opt/kde3/include/kconfigbase.h /usr/lib/qt3/include/ntqdatetime.h \ - /usr/lib/qt3/include/ntqvariant.h /opt/kde3/include/kconfigdata.h \ + /opt/kde3/include/tdelibs_export.h /opt/kde3/include/tdemacros.h \ + /opt/kde3/include/tdeversion.h /opt/kde3/include/tdeconfig.h \ + /opt/kde3/include/tdeconfigbase.h /usr/lib/qt3/include/ntqdatetime.h \ + /usr/lib/qt3/include/ntqvariant.h /opt/kde3/include/tdeconfigdata.h \ /opt/kde3/include/klockfile.h /opt/kde3/include/ksharedptr.h \ malloryclient.h /usr/lib/qt3/include/ntqlayout.h \ /usr/lib/qt3/include/ntqsizepolicy.h /usr/lib/qt3/include/ntqwidget.h \ @@ -135,9 +135,9 @@ malloryhandler.lo .libs/malloryhandler.o: malloryhandler.cpp \ malloryhandler.h: -/opt/kde3/include/kdecorationfactory.h: +/opt/kde3/include/tdecorationfactory.h: -/opt/kde3/include/kdecoration.h: +/opt/kde3/include/tdecoration.h: /usr/lib/qt3/include/ntqcolor.h: @@ -529,21 +529,21 @@ malloryhandler.h: /opt/kde3/include/netwm_def.h: -/opt/kde3/include/kdelibs_export.h: +/opt/kde3/include/tdelibs_export.h: -/opt/kde3/include/kdemacros.h: +/opt/kde3/include/tdemacros.h: -/opt/kde3/include/kdeversion.h: +/opt/kde3/include/tdeversion.h: -/opt/kde3/include/kconfig.h: +/opt/kde3/include/tdeconfig.h: -/opt/kde3/include/kconfigbase.h: +/opt/kde3/include/tdeconfigbase.h: /usr/lib/qt3/include/ntqdatetime.h: /usr/lib/qt3/include/ntqvariant.h: -/opt/kde3/include/kconfigdata.h: +/opt/kde3/include/tdeconfigdata.h: /opt/kde3/include/klockfile.h: diff --git a/malloryclient/.deps/pixmaps.Plo b/malloryclient/.deps/pixmaps.Plo index 182b4c5..65cb464 100644 --- a/malloryclient/.deps/pixmaps.Plo +++ b/malloryclient/.deps/pixmaps.Plo @@ -108,17 +108,17 @@ pixmaps.lo .libs/pixmaps.o: pixmaps.cpp pixmaps.h \ /usr/lib/qt3/include/ntqregion.h /usr/lib/qt3/include/ntqpen.h \ /usr/lib/qt3/include/ntqbrush.h /usr/lib/qt3/include/ntqpointarray.h \ /usr/lib/qt3/include/ntqwmatrix.h /usr/lib/qt3/include/ntqimage.h \ - malloryhandler.h /opt/kde3/include/kdecorationfactory.h \ - /opt/kde3/include/kdecoration.h /usr/lib/qt3/include/ntqobject.h \ + malloryhandler.h /opt/kde3/include/tdecorationfactory.h \ + /opt/kde3/include/tdecoration.h /usr/lib/qt3/include/ntqobject.h \ /usr/lib/qt3/include/ntqevent.h /usr/lib/qt3/include/ntqmime.h \ /usr/lib/qt3/include/ntqmap.h /usr/lib/qt3/include/ntqpair.h \ /usr/include/g++/map /usr/include/g++/bits/stl_tree.h \ /usr/include/g++/bits/stl_map.h /usr/include/g++/bits/stl_multimap.h \ /usr/lib/qt3/include/ntqiconset.h /opt/kde3/include/netwm_def.h \ - /opt/kde3/include/kdelibs_export.h /opt/kde3/include/kdemacros.h \ - /opt/kde3/include/kdeversion.h /opt/kde3/include/kconfig.h \ - /opt/kde3/include/kconfigbase.h /usr/lib/qt3/include/ntqdatetime.h \ - /usr/lib/qt3/include/ntqvariant.h /opt/kde3/include/kconfigdata.h \ + /opt/kde3/include/tdelibs_export.h /opt/kde3/include/tdemacros.h \ + /opt/kde3/include/tdeversion.h /opt/kde3/include/tdeconfig.h \ + /opt/kde3/include/tdeconfigbase.h /usr/lib/qt3/include/ntqdatetime.h \ + /usr/lib/qt3/include/ntqvariant.h /opt/kde3/include/tdeconfigdata.h \ /opt/kde3/include/klockfile.h /opt/kde3/include/ksharedptr.h \ /opt/kde3/include/kpixmapeffect.h /opt/kde3/include/kpixmap.h \ /opt/kde3/include/kpixmapio.h @@ -511,9 +511,9 @@ pixmaps.h: malloryhandler.h: -/opt/kde3/include/kdecorationfactory.h: +/opt/kde3/include/tdecorationfactory.h: -/opt/kde3/include/kdecoration.h: +/opt/kde3/include/tdecoration.h: /usr/lib/qt3/include/ntqobject.h: @@ -537,21 +537,21 @@ malloryhandler.h: /opt/kde3/include/netwm_def.h: -/opt/kde3/include/kdelibs_export.h: +/opt/kde3/include/tdelibs_export.h: -/opt/kde3/include/kdemacros.h: +/opt/kde3/include/tdemacros.h: -/opt/kde3/include/kdeversion.h: +/opt/kde3/include/tdeversion.h: -/opt/kde3/include/kconfig.h: +/opt/kde3/include/tdeconfig.h: -/opt/kde3/include/kconfigbase.h: +/opt/kde3/include/tdeconfigbase.h: /usr/lib/qt3/include/ntqdatetime.h: /usr/lib/qt3/include/ntqvariant.h: -/opt/kde3/include/kconfigdata.h: +/opt/kde3/include/tdeconfigdata.h: /opt/kde3/include/klockfile.h: diff --git a/malloryclient/Makefile b/malloryclient/Makefile index 5175967..2d0c7bb 100644 --- a/malloryclient/Makefile +++ b/malloryclient/Makefile @@ -106,7 +106,7 @@ JAR = @JAR@ JAVAC = @JAVAC@ JAVAH = @JAVAH@ JVMLIBS = @JVMLIBS@ -KDECONFIG = /opt/kde3/bin/kde-config +KDECONFIG = /opt/kde3/bin/tde-config KDE_EXTRA_RPATH = KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ KDE_HAVE_DOT = @KDE_HAVE_DOT@ @@ -151,18 +151,18 @@ LIBUTIL = -lutil LIBZ = -lz LIB_JASPER = @LIB_JASPER@ LIB_KAB = -lkab -LIB_KABC = -lkabc -LIB_KDECORE = -lkdecore -LIB_KDEPRINT = -lkdeprint -LIB_KDEUI = -lkdeui -LIB_KFILE = -lkio +LIB_KABC = -ltdeabc +LIB_TDECORE = -ltdecore +LIB_TDEPRINT = -ltdeprint +LIB_TDEUI = -ltdeui +LIB_KFILE = -ltdeio LIB_KFM = -LIB_KHTML = -lkhtml +LIB_TDEHTML = -ltdehtml LIB_KIMGIO = @LIB_KIMGIO@ -LIB_KIO = -lkio -LIB_KPARTS = -lkparts -LIB_KSPELL = -lkspell -LIB_KSYCOCA = -lkio +LIB_TDEIO = -ltdeio +LIB_TDEPARTS = -ltdeparts +LIB_TDESPELL = -ltdespell +LIB_TDESYCOCA = -ltdeio LIB_POLL = LIB_QPE = LIB_QT = -ltqt-mt $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread @@ -245,7 +245,7 @@ kde_styledir = ${libdir}/kde3/plugins/styles kde_templatesdir = ${prefix}/share/templates kde_wallpaperdir = ${prefix}/share/wallpapers kde_widgetdir = /opt/kde3/lib/kde3/plugins/designer -kdeinitdir = $(kde_moduledir) +tdeinitdir = $(kde_moduledir) micodir = @micodir@ qt_includes = /usr/lib/qt3/include qt_libraries = /usr/lib/qt3/lib @@ -259,37 +259,37 @@ SUBDIRS = config KDE_CXXFLAGS = -DQT_PLUGIN -INCLUDES = $(all_includes) -I$(kde_includes)/kwin +INCLUDES = $(all_includes) -I$(kde_includes)/twin -kwindir = $(kde_datadir)/kwin/ -kwin_DATA = mallory.desktop +twindir = $(kde_datadir)/twin/ +twin_DATA = mallory.desktop noinst_HEADERS = embeddata.h malloryclient.h malloryhandler.h mallorybutton.h enums.h pixmaps.h -kde_module_LTLIBRARIES = kwin3_mallory.la +kde_module_LTLIBRARIES = twin3_mallory.la -kwin3_mallory_la_LIBADD = $(LIB_KDEUI) $(kde_libraries)/libkdecorations.la -kwin3_mallory_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -#>- kwin3_mallory_la_METASOURCES = AUTO +twin3_mallory_la_LIBADD = $(LIB_TDEUI) $(kde_libraries)/libtdecorations.la +twin3_mallory_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +#>- twin3_mallory_la_METASOURCES = AUTO -DISTCLEANFILES = $(kwin_mallory_la_METASOURCES) -kwin3_mallory_la_SOURCES = malloryclient.cpp malloryhandler.cpp mallorybutton.cpp pixmaps.cpp embeddata.cpp +DISTCLEANFILES = $(twin_mallory_la_METASOURCES) +twin3_mallory_la_SOURCES = malloryclient.cpp malloryhandler.cpp mallorybutton.cpp pixmaps.cpp embeddata.cpp subdir = malloryclient mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) -kwin3_mallory_la_DEPENDENCIES = $(kde_libraries)/libkdecorations.la -am_kwin3_mallory_la_OBJECTS = malloryclient.lo malloryhandler.lo \ +twin3_mallory_la_DEPENDENCIES = $(kde_libraries)/libtdecorations.la +am_twin3_mallory_la_OBJECTS = malloryclient.lo malloryhandler.lo \ mallorybutton.lo pixmaps.lo embeddata.lo -#>- kwin3_mallory_la_OBJECTS = $(am_kwin3_mallory_la_OBJECTS) +#>- twin3_mallory_la_OBJECTS = $(am_twin3_mallory_la_OBJECTS) #>+ 5 -kwin3_mallory_la_final_OBJECTS = kwin3_mallory_la.all_cpp.lo -kwin3_mallory_la_nofinal_OBJECTS = malloryclient.lo malloryhandler.lo \ +twin3_mallory_la_final_OBJECTS = twin3_mallory_la.all_cpp.lo +twin3_mallory_la_nofinal_OBJECTS = malloryclient.lo malloryhandler.lo \ mallorybutton.lo pixmaps.lo embeddata.lo -kwin3_mallory_la_OBJECTS = $(kwin3_mallory_la_nofinal_OBJECTS) -#kwin3_mallory_la_OBJECTS = $(kwin3_mallory_la_final_OBJECTS) +twin3_mallory_la_OBJECTS = $(twin3_mallory_la_nofinal_OBJECTS) +#twin3_mallory_la_OBJECTS = $(twin3_mallory_la_final_OBJECTS) DEFS = -DHAVE_CONFIG_H DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) @@ -303,7 +303,7 @@ am__depfiles_maybe = depfiles #>- ./$(DEPDIR)/malloryhandler.Plo \ #>- ./$(DEPDIR)/embeddata.Plo ./$(DEPDIR)/pixmaps.Plo #>+ 9 -#DEP_FILES = $(DEPDIR)/kwin3_mallory_la.all_cpp.P ./$(DEPDIR)/mallorybutton.Plo \ +#DEP_FILES = $(DEPDIR)/twin3_mallory_la.all_cpp.P ./$(DEPDIR)/mallorybutton.Plo \ # ./$(DEPDIR)/malloryclient.Plo \ # ./$(DEPDIR)/malloryhandler.Plo \ # ./$(DEPDIR)/embeddata.Plo ./$(DEPDIR)/pixmaps.Plo @@ -331,8 +331,8 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic -W -Wpointer-arith -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -O2 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common -DIST_SOURCES = $(kwin3_mallory_la_SOURCES) -DATA = $(kwin_DATA) +DIST_SOURCES = $(twin3_mallory_la_SOURCES) +DATA = $(twin_DATA) HEADERS = $(noinst_HEADERS) @@ -353,7 +353,7 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ uninstall-recursive check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(kwin3_mallory_la_SOURCES) +SOURCES = $(twin3_mallory_la_SOURCES) #>- all: all-recursive #>+ 1 @@ -398,11 +398,11 @@ clean-kde_moduleLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -#>- kwin3_mallory.la: $(kwin3_mallory_la_OBJECTS) $(kwin3_mallory_la_DEPENDENCIES) +#>- twin3_mallory.la: $(twin3_mallory_la_OBJECTS) $(twin3_mallory_la_DEPENDENCIES) #>+ 2 -kwin3_mallory.la: kwin3_mallory.la.closure $(kwin3_mallory_la_OBJECTS) $(kwin3_mallory_la_DEPENDENCIES) -#kwin3_mallory.la: $(kwin3_mallory_la_OBJECTS) $(kwin3_mallory_la_DEPENDENCIES) - $(CXXLINK) -rpath $(kde_moduledir) $(kwin3_mallory_la_LDFLAGS) $(kwin3_mallory_la_OBJECTS) $(kwin3_mallory_la_LIBADD) $(LIBS) +twin3_mallory.la: twin3_mallory.la.closure $(twin3_mallory_la_OBJECTS) $(twin3_mallory_la_DEPENDENCIES) +#twin3_mallory.la: $(twin3_mallory_la_OBJECTS) $(twin3_mallory_la_DEPENDENCIES) + $(CXXLINK) -rpath $(kde_moduledir) $(twin3_mallory_la_LDFLAGS) $(twin3_mallory_la_OBJECTS) $(twin3_mallory_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) core *.core @@ -447,23 +447,23 @@ clean-libtool: distclean-libtool: -rm -f libtool uninstall-info-am: -kwinDATA_INSTALL = $(INSTALL_DATA) -install-kwinDATA: $(kwin_DATA) +twinDATA_INSTALL = $(INSTALL_DATA) +install-twinDATA: $(twin_DATA) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(kwindir) - @list='$(kwin_DATA)'; for p in $$list; do \ + $(mkinstalldirs) $(DESTDIR)$(twindir) + @list='$(twin_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(kwinDATA_INSTALL) $$d$$p $(DESTDIR)$(kwindir)/$$f"; \ - $(kwinDATA_INSTALL) $$d$$p $(DESTDIR)$(kwindir)/$$f; \ + echo " $(twinDATA_INSTALL) $$d$$p $(DESTDIR)$(twindir)/$$f"; \ + $(twinDATA_INSTALL) $$d$$p $(DESTDIR)$(twindir)/$$f; \ done -uninstall-kwinDATA: +uninstall-twinDATA: @$(NORMAL_UNINSTALL) - @list='$(kwin_DATA)'; for p in $$list; do \ + @list='$(twin_DATA)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(kwindir)/$$f"; \ - rm -f $(DESTDIR)$(kwindir)/$$f; \ + echo " rm -f $(DESTDIR)$(twindir)/$$f"; \ + rm -f $(DESTDIR)$(twindir)/$$f; \ done # This directory's subdirectories are mostly independent; you can cd @@ -563,7 +563,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=kwin_mallory.la.closure mallory.desktop +KDE_DIST=twin_mallory.la.closure mallory.desktop DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) @@ -610,7 +610,7 @@ check: check-recursive all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) installdirs: installdirs-recursive installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kwindir) + $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(twindir) install: install-recursive install-exec: install-exec-recursive @@ -660,9 +660,9 @@ info: info-recursive info-am: -#>- install-data-am: install-kde_moduleLTLIBRARIES install-kwinDATA +#>- install-data-am: install-kde_moduleLTLIBRARIES install-twinDATA #>+ 1 -install-data-am: install-kwinDATA +install-data-am: install-twinDATA #>- install-exec-am: #>+ 1 @@ -684,7 +684,7 @@ mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ - uninstall-kwinDATA + uninstall-twinDATA uninstall-info: uninstall-info-recursive @@ -697,26 +697,26 @@ uninstall-info: uninstall-info-recursive install-data-recursive install-exec install-exec-am \ install-exec-recursive install-info install-info-am \ install-info-recursive install-kde_moduleLTLIBRARIES \ - install-kwinDATA install-man install-recursive install-strip \ + install-twinDATA install-man install-recursive install-strip \ installcheck installcheck-am installdirs installdirs-am \ installdirs-recursive maintainer-clean maintainer-clean-generic \ maintainer-clean-recursive mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ tags tags-recursive uninstall uninstall-am uninstall-info-am \ uninstall-info-recursive uninstall-kde_moduleLTLIBRARIES \ - uninstall-kwinDATA uninstall-recursive + uninstall-twinDATA uninstall-recursive # 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: #>+ 8 -kwin3_mallory.la.closure: $(kwin3_mallory_la_OBJECTS) $(kwin3_mallory_la_DEPENDENCIES) - @echo "int main() {return 0;}" > kwin3_mallory_la_closure.cpp - @$(LTCXXCOMPILE) -c kwin3_mallory_la_closure.cpp - $(CXXLINK) kwin3_mallory_la_closure.lo $(kwin3_mallory_la_LDFLAGS) $(kwin3_mallory_la_OBJECTS) $(kwin3_mallory_la_LIBADD) $(LIBS) - @rm -f kwin3_mallory_la_closure.* kwin3_mallory.la.closure - @echo "timestamp" > kwin3_mallory.la.closure +twin3_mallory.la.closure: $(twin3_mallory_la_OBJECTS) $(twin3_mallory_la_DEPENDENCIES) + @echo "int main() {return 0;}" > twin3_mallory_la_closure.cpp + @$(LTCXXCOMPILE) -c twin3_mallory_la_closure.cpp + $(CXXLINK) twin3_mallory_la_closure.lo $(twin3_mallory_la_LDFLAGS) $(twin3_mallory_la_OBJECTS) $(twin3_mallory_la_LIBADD) $(LIBS) + @rm -f twin3_mallory_la_closure.* twin3_mallory.la.closure + @echo "timestamp" > twin3_mallory.la.closure #>+ 3 @@ -743,7 +743,7 @@ clean-metasources: #>+ 3 clean-closures: - -rm -f kwin3_mallory.la.closure + -rm -f twin3_mallory.la.closure #>+ 2 docs-am: @@ -777,33 +777,33 @@ bcheck-am: #>+ 11 -kwin3_mallory_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/malloryclient.cpp $(srcdir)/malloryhandler.cpp $(srcdir)/mallorybutton.cpp $(srcdir)/pixmaps.cpp $(srcdir)/embeddata.cpp mallorybutton.moc malloryclient.moc malloryhandler.moc - @echo 'creating kwin3_mallory_la.all_cpp.cpp ...'; \ - rm -f kwin3_mallory_la.all_cpp.files kwin3_mallory_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kwin3_mallory_la.all_cpp.final; \ +twin3_mallory_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/malloryclient.cpp $(srcdir)/malloryhandler.cpp $(srcdir)/mallorybutton.cpp $(srcdir)/pixmaps.cpp $(srcdir)/embeddata.cpp mallorybutton.moc malloryclient.moc malloryhandler.moc + @echo 'creating twin3_mallory_la.all_cpp.cpp ...'; \ + rm -f twin3_mallory_la.all_cpp.files twin3_mallory_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> twin3_mallory_la.all_cpp.final; \ for file in malloryclient.cpp malloryhandler.cpp mallorybutton.cpp pixmaps.cpp embeddata.cpp ; do \ - echo "#include \"$$file\"" >> kwin3_mallory_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwin3_mallory_la.all_cpp.final; \ + echo "#include \"$$file\"" >> twin3_mallory_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> twin3_mallory_la.all_cpp.final; \ done; \ - cat kwin3_mallory_la.all_cpp.final kwin3_mallory_la.all_cpp.files > kwin3_mallory_la.all_cpp.cpp; \ - rm -f kwin3_mallory_la.all_cpp.final kwin3_mallory_la.all_cpp.files + cat twin3_mallory_la.all_cpp.final twin3_mallory_la.all_cpp.files > twin3_mallory_la.all_cpp.cpp; \ + rm -f twin3_mallory_la.all_cpp.final twin3_mallory_la.all_cpp.files #>+ 3 clean-final: - -rm -f kwin3_mallory_la.all_cpp.cpp + -rm -f twin3_mallory_la.all_cpp.cpp #>+ 2 final: - $(MAKE) kwin3_mallory_la_OBJECTS="$(kwin3_mallory_la_final_OBJECTS)" all-am + $(MAKE) twin3_mallory_la_OBJECTS="$(twin3_mallory_la_final_OBJECTS)" all-am #>+ 2 final-install: - $(MAKE) kwin3_mallory_la_OBJECTS="$(kwin3_mallory_la_final_OBJECTS)" install-am + $(MAKE) twin3_mallory_la_OBJECTS="$(twin3_mallory_la_final_OBJECTS)" install-am #>+ 2 no-final: - $(MAKE) kwin3_mallory_la_OBJECTS="$(kwin3_mallory_la_nofinal_OBJECTS)" all-am + $(MAKE) twin3_mallory_la_OBJECTS="$(twin3_mallory_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: - $(MAKE) kwin3_mallory_la_OBJECTS="$(kwin3_mallory_la_nofinal_OBJECTS)" install-am + $(MAKE) twin3_mallory_la_OBJECTS="$(twin3_mallory_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/malloryclient/Makefile.am b/malloryclient/Makefile.am index cea722d..9d77a02 100644 --- a/malloryclient/Makefile.am +++ b/malloryclient/Makefile.am @@ -4,18 +4,18 @@ SUBDIRS = config KDE_CXXFLAGS = -DQT_PLUGIN -INCLUDES = $(all_includes) -I$(kde_includes)/kwin +INCLUDES = $(all_includes) -I$(kde_includes)/twin -kwindir = $(kde_datadir)/kwin/ -kwin_DATA = mallory.desktop +twindir = $(kde_datadir)/twin/ +twin_DATA = mallory.desktop noinst_HEADERS = embeddata.h malloryclient.h malloryhandler.h mallorybutton.h enums.h pixmaps.h -kde_module_LTLIBRARIES = kwin3_mallory.la +kde_module_LTLIBRARIES = twin3_mallory.la -kwin3_mallory_la_LIBADD = $(LIB_KDEUI) $(kde_libraries)/libkdecorations.la -kwin3_mallory_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin3_mallory_la_METASOURCES = AUTO +twin3_mallory_la_LIBADD = $(LIB_TDEUI) $(kde_libraries)/libtdecorations.la +twin3_mallory_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin3_mallory_la_METASOURCES = AUTO -DISTCLEANFILES = $(kwin_mallory_la_METASOURCES) -kwin3_mallory_la_SOURCES = malloryclient.cpp malloryhandler.cpp mallorybutton.cpp pixmaps.cpp embeddata.cpp +DISTCLEANFILES = $(twin_mallory_la_METASOURCES) +twin3_mallory_la_SOURCES = malloryclient.cpp malloryhandler.cpp mallorybutton.cpp pixmaps.cpp embeddata.cpp diff --git a/malloryclient/Makefile.in b/malloryclient/Makefile.in index c9629d3..7eff55b 100644 --- a/malloryclient/Makefile.in +++ b/malloryclient/Makefile.in @@ -151,17 +151,17 @@ LIBZ = @LIBZ@ LIB_JASPER = @LIB_JASPER@ LIB_KAB = @LIB_KAB@ LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ +LIB_TDECORE = @LIB_TDECORE@ +LIB_TDEPRINT = @LIB_TDEPRINT@ +LIB_TDEUI = @LIB_TDEUI@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ +LIB_TDEHTML = @LIB_TDEHTML@ LIB_KIMGIO = @LIB_KIMGIO@ -LIB_KIO = @LIB_KIO@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ +LIB_TDEIO = @LIB_TDEIO@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ @@ -244,7 +244,7 @@ kde_styledir = @kde_styledir@ kde_templatesdir = @kde_templatesdir@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ +tdeinitdir = @tdeinitdir@ micodir = @micodir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ @@ -258,37 +258,37 @@ SUBDIRS = config KDE_CXXFLAGS = -DQT_PLUGIN -INCLUDES = $(all_includes) -I$(kde_includes)/kwin +INCLUDES = $(all_includes) -I$(kde_includes)/twin -kwindir = $(kde_datadir)/kwin/ -kwin_DATA = mallory.desktop +twindir = $(kde_datadir)/twin/ +twin_DATA = mallory.desktop noinst_HEADERS = embeddata.h malloryclient.h malloryhandler.h mallorybutton.h enums.h pixmaps.h -kde_module_LTLIBRARIES = kwin3_mallory.la +kde_module_LTLIBRARIES = twin3_mallory.la -kwin3_mallory_la_LIBADD = $(LIB_KDEUI) $(kde_libraries)/libkdecorations.la -kwin3_mallory_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -#>- kwin3_mallory_la_METASOURCES = AUTO +twin3_mallory_la_LIBADD = $(LIB_TDEUI) $(kde_libraries)/libtdecorations.la +twin3_mallory_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +#>- twin3_mallory_la_METASOURCES = AUTO -DISTCLEANFILES = $(kwin_mallory_la_METASOURCES) -kwin3_mallory_la_SOURCES = malloryclient.cpp malloryhandler.cpp mallorybutton.cpp pixmaps.cpp embeddata.cpp +DISTCLEANFILES = $(twin_mallory_la_METASOURCES) +twin3_mallory_la_SOURCES = malloryclient.cpp malloryhandler.cpp mallorybutton.cpp pixmaps.cpp embeddata.cpp subdir = malloryclient mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) -kwin3_mallory_la_DEPENDENCIES = $(kde_libraries)/libkdecorations.la -am_kwin3_mallory_la_OBJECTS = malloryclient.lo malloryhandler.lo \ +twin3_mallory_la_DEPENDENCIES = $(kde_libraries)/libtdecorations.la +am_twin3_mallory_la_OBJECTS = malloryclient.lo malloryhandler.lo \ mallorybutton.lo pixmaps.lo embeddata.lo -#>- kwin3_mallory_la_OBJECTS = $(am_kwin3_mallory_la_OBJECTS) +#>- twin3_mallory_la_OBJECTS = $(am_twin3_mallory_la_OBJECTS) #>+ 5 -kwin3_mallory_la_final_OBJECTS = kwin3_mallory_la.all_cpp.lo -kwin3_mallory_la_nofinal_OBJECTS = malloryclient.lo malloryhandler.lo \ +twin3_mallory_la_final_OBJECTS = twin3_mallory_la.all_cpp.lo +twin3_mallory_la_nofinal_OBJECTS = malloryclient.lo malloryhandler.lo \ mallorybutton.lo pixmaps.lo embeddata.lo -@KDE_USE_FINAL_FALSE@kwin3_mallory_la_OBJECTS = $(kwin3_mallory_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kwin3_mallory_la_OBJECTS = $(kwin3_mallory_la_final_OBJECTS) +@KDE_USE_FINAL_FALSE@twin3_mallory_la_OBJECTS = $(twin3_mallory_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@twin3_mallory_la_OBJECTS = $(twin3_mallory_la_final_OBJECTS) DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) @@ -302,7 +302,7 @@ am__depfiles_maybe = depfiles #>- @AMDEP_TRUE@ ./$(DEPDIR)/malloryhandler.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/embeddata.Plo ./$(DEPDIR)/pixmaps.Plo #>+ 9 -@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kwin3_mallory_la.all_cpp.P ./$(DEPDIR)/mallorybutton.Plo \ +@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/twin3_mallory_la.all_cpp.P ./$(DEPDIR)/mallorybutton.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/malloryclient.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/malloryhandler.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/embeddata.Plo ./$(DEPDIR)/pixmaps.Plo @@ -330,8 +330,8 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ -DIST_SOURCES = $(kwin3_mallory_la_SOURCES) -DATA = $(kwin_DATA) +DIST_SOURCES = $(twin3_mallory_la_SOURCES) +DATA = $(twin_DATA) HEADERS = $(noinst_HEADERS) @@ -352,7 +352,7 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ uninstall-recursive check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(kwin3_mallory_la_SOURCES) +SOURCES = $(twin3_mallory_la_SOURCES) #>- all: all-recursive #>+ 1 @@ -397,11 +397,11 @@ clean-kde_moduleLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -#>- kwin3_mallory.la: $(kwin3_mallory_la_OBJECTS) $(kwin3_mallory_la_DEPENDENCIES) +#>- twin3_mallory.la: $(twin3_mallory_la_OBJECTS) $(twin3_mallory_la_DEPENDENCIES) #>+ 2 -@KDE_USE_CLOSURE_TRUE@kwin3_mallory.la: kwin3_mallory.la.closure $(kwin3_mallory_la_OBJECTS) $(kwin3_mallory_la_DEPENDENCIES) -@KDE_USE_CLOSURE_FALSE@kwin3_mallory.la: $(kwin3_mallory_la_OBJECTS) $(kwin3_mallory_la_DEPENDENCIES) - $(CXXLINK) -rpath $(kde_moduledir) $(kwin3_mallory_la_LDFLAGS) $(kwin3_mallory_la_OBJECTS) $(kwin3_mallory_la_LIBADD) $(LIBS) +@KDE_USE_CLOSURE_TRUE@twin3_mallory.la: twin3_mallory.la.closure $(twin3_mallory_la_OBJECTS) $(twin3_mallory_la_DEPENDENCIES) +@KDE_USE_CLOSURE_FALSE@twin3_mallory.la: $(twin3_mallory_la_OBJECTS) $(twin3_mallory_la_DEPENDENCIES) + $(CXXLINK) -rpath $(kde_moduledir) $(twin3_mallory_la_LDFLAGS) $(twin3_mallory_la_OBJECTS) $(twin3_mallory_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) core *.core @@ -446,23 +446,23 @@ clean-libtool: distclean-libtool: -rm -f libtool uninstall-info-am: -kwinDATA_INSTALL = $(INSTALL_DATA) -install-kwinDATA: $(kwin_DATA) +twinDATA_INSTALL = $(INSTALL_DATA) +install-twinDATA: $(twin_DATA) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(kwindir) - @list='$(kwin_DATA)'; for p in $$list; do \ + $(mkinstalldirs) $(DESTDIR)$(twindir) + @list='$(twin_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(kwinDATA_INSTALL) $$d$$p $(DESTDIR)$(kwindir)/$$f"; \ - $(kwinDATA_INSTALL) $$d$$p $(DESTDIR)$(kwindir)/$$f; \ + echo " $(twinDATA_INSTALL) $$d$$p $(DESTDIR)$(twindir)/$$f"; \ + $(twinDATA_INSTALL) $$d$$p $(DESTDIR)$(twindir)/$$f; \ done -uninstall-kwinDATA: +uninstall-twinDATA: @$(NORMAL_UNINSTALL) - @list='$(kwin_DATA)'; for p in $$list; do \ + @list='$(twin_DATA)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(kwindir)/$$f"; \ - rm -f $(DESTDIR)$(kwindir)/$$f; \ + echo " rm -f $(DESTDIR)$(twindir)/$$f"; \ + rm -f $(DESTDIR)$(twindir)/$$f; \ done # This directory's subdirectories are mostly independent; you can cd @@ -562,7 +562,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=kwin_mallory.la.closure mallory.desktop +KDE_DIST=twin_mallory.la.closure mallory.desktop DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) @@ -609,7 +609,7 @@ check: check-recursive all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) installdirs: installdirs-recursive installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kwindir) + $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(twindir) install: install-recursive install-exec: install-exec-recursive @@ -659,9 +659,9 @@ info: info-recursive info-am: -#>- install-data-am: install-kde_moduleLTLIBRARIES install-kwinDATA +#>- install-data-am: install-kde_moduleLTLIBRARIES install-twinDATA #>+ 1 -install-data-am: install-kwinDATA +install-data-am: install-twinDATA #>- install-exec-am: #>+ 1 @@ -683,7 +683,7 @@ mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ - uninstall-kwinDATA + uninstall-twinDATA uninstall-info: uninstall-info-recursive @@ -696,26 +696,26 @@ uninstall-info: uninstall-info-recursive install-data-recursive install-exec install-exec-am \ install-exec-recursive install-info install-info-am \ install-info-recursive install-kde_moduleLTLIBRARIES \ - install-kwinDATA install-man install-recursive install-strip \ + install-twinDATA install-man install-recursive install-strip \ installcheck installcheck-am installdirs installdirs-am \ installdirs-recursive maintainer-clean maintainer-clean-generic \ maintainer-clean-recursive mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ tags tags-recursive uninstall uninstall-am uninstall-info-am \ uninstall-info-recursive uninstall-kde_moduleLTLIBRARIES \ - uninstall-kwinDATA uninstall-recursive + uninstall-twinDATA uninstall-recursive # 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: #>+ 8 -kwin3_mallory.la.closure: $(kwin3_mallory_la_OBJECTS) $(kwin3_mallory_la_DEPENDENCIES) - @echo "int main() {return 0;}" > kwin3_mallory_la_closure.cpp - @$(LTCXXCOMPILE) -c kwin3_mallory_la_closure.cpp - $(CXXLINK) kwin3_mallory_la_closure.lo $(kwin3_mallory_la_LDFLAGS) $(kwin3_mallory_la_OBJECTS) $(kwin3_mallory_la_LIBADD) $(LIBS) - @rm -f kwin3_mallory_la_closure.* kwin3_mallory.la.closure - @echo "timestamp" > kwin3_mallory.la.closure +twin3_mallory.la.closure: $(twin3_mallory_la_OBJECTS) $(twin3_mallory_la_DEPENDENCIES) + @echo "int main() {return 0;}" > twin3_mallory_la_closure.cpp + @$(LTCXXCOMPILE) -c twin3_mallory_la_closure.cpp + $(CXXLINK) twin3_mallory_la_closure.lo $(twin3_mallory_la_LDFLAGS) $(twin3_mallory_la_OBJECTS) $(twin3_mallory_la_LIBADD) $(LIBS) + @rm -f twin3_mallory_la_closure.* twin3_mallory.la.closure + @echo "timestamp" > twin3_mallory.la.closure #>+ 3 @@ -742,7 +742,7 @@ clean-metasources: #>+ 3 clean-closures: - -rm -f kwin3_mallory.la.closure + -rm -f twin3_mallory.la.closure #>+ 2 docs-am: @@ -776,33 +776,33 @@ bcheck-am: #>+ 11 -kwin3_mallory_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/malloryclient.cpp $(srcdir)/malloryhandler.cpp $(srcdir)/mallorybutton.cpp $(srcdir)/pixmaps.cpp $(srcdir)/embeddata.cpp mallorybutton.moc malloryclient.moc malloryhandler.moc - @echo 'creating kwin3_mallory_la.all_cpp.cpp ...'; \ - rm -f kwin3_mallory_la.all_cpp.files kwin3_mallory_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kwin3_mallory_la.all_cpp.final; \ +twin3_mallory_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/malloryclient.cpp $(srcdir)/malloryhandler.cpp $(srcdir)/mallorybutton.cpp $(srcdir)/pixmaps.cpp $(srcdir)/embeddata.cpp mallorybutton.moc malloryclient.moc malloryhandler.moc + @echo 'creating twin3_mallory_la.all_cpp.cpp ...'; \ + rm -f twin3_mallory_la.all_cpp.files twin3_mallory_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> twin3_mallory_la.all_cpp.final; \ for file in malloryclient.cpp malloryhandler.cpp mallorybutton.cpp pixmaps.cpp embeddata.cpp ; do \ - echo "#include \"$$file\"" >> kwin3_mallory_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwin3_mallory_la.all_cpp.final; \ + echo "#include \"$$file\"" >> twin3_mallory_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> twin3_mallory_la.all_cpp.final; \ done; \ - cat kwin3_mallory_la.all_cpp.final kwin3_mallory_la.all_cpp.files > kwin3_mallory_la.all_cpp.cpp; \ - rm -f kwin3_mallory_la.all_cpp.final kwin3_mallory_la.all_cpp.files + cat twin3_mallory_la.all_cpp.final twin3_mallory_la.all_cpp.files > twin3_mallory_la.all_cpp.cpp; \ + rm -f twin3_mallory_la.all_cpp.final twin3_mallory_la.all_cpp.files #>+ 3 clean-final: - -rm -f kwin3_mallory_la.all_cpp.cpp + -rm -f twin3_mallory_la.all_cpp.cpp #>+ 2 final: - $(MAKE) kwin3_mallory_la_OBJECTS="$(kwin3_mallory_la_final_OBJECTS)" all-am + $(MAKE) twin3_mallory_la_OBJECTS="$(twin3_mallory_la_final_OBJECTS)" all-am #>+ 2 final-install: - $(MAKE) kwin3_mallory_la_OBJECTS="$(kwin3_mallory_la_final_OBJECTS)" install-am + $(MAKE) twin3_mallory_la_OBJECTS="$(twin3_mallory_la_final_OBJECTS)" install-am #>+ 2 no-final: - $(MAKE) kwin3_mallory_la_OBJECTS="$(kwin3_mallory_la_nofinal_OBJECTS)" all-am + $(MAKE) twin3_mallory_la_OBJECTS="$(twin3_mallory_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: - $(MAKE) kwin3_mallory_la_OBJECTS="$(kwin3_mallory_la_nofinal_OBJECTS)" install-am + $(MAKE) twin3_mallory_la_OBJECTS="$(twin3_mallory_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/malloryclient/config/.deps/configdialog.Plo b/malloryclient/config/.deps/configdialog.Plo index 613c17c..e4cb4ca 100644 --- a/malloryclient/config/.deps/configdialog.Plo +++ b/malloryclient/config/.deps/configdialog.Plo @@ -1,5 +1,5 @@ configdialog.lo .libs/configdialog.o: configdialog.cpp \ - /opt/kde3/include/klocale.h /usr/lib/qt3/include/ntqstring.h \ + /opt/kde3/include/tdelocale.h /usr/lib/qt3/include/ntqstring.h \ /usr/lib/qt3/include/ntqcstring.h /usr/lib/qt3/include/ntqmemarray.h \ /usr/lib/qt3/include/ntqgarray.h /usr/lib/qt3/include/ntqshared.h \ /usr/lib/qt3/include/ntqglobal.h /usr/lib/qt3/include/ntqconfig.h \ @@ -67,7 +67,7 @@ configdialog.lo .libs/configdialog.o: configdialog.cpp \ /usr/include/g++/bits/stl_algo.h /usr/include/g++/bits/stl_heap.h \ /usr/include/g++/bits/stl_tempbuf.h \ /usr/include/g++/bits/basic_string.tcc \ - /opt/kde3/include/kdelibs_export.h /opt/kde3/include/kdemacros.h \ + /opt/kde3/include/tdelibs_export.h /opt/kde3/include/tdemacros.h \ configdialog.h /usr/lib/qt3/include/ntqvariant.h \ /usr/lib/qt3/include/ntqvaluelist.h /usr/lib/qt3/include/ntqtl.h \ /usr/lib/qt3/include/ntqtextstream.h /usr/lib/qt3/include/ntqiodevice.h \ @@ -129,7 +129,7 @@ configdialog.lo .libs/configdialog.o: configdialog.cpp \ /usr/lib/qt3/include/private/qucomextra_p.h \ /usr/lib/qt3/include/private/qucom_p.h /usr/lib/qt3/include/ntquuid.h -/opt/kde3/include/klocale.h: +/opt/kde3/include/tdelocale.h: /usr/lib/qt3/include/ntqstring.h: @@ -359,9 +359,9 @@ configdialog.lo .libs/configdialog.o: configdialog.cpp \ /usr/include/g++/bits/basic_string.tcc: -/opt/kde3/include/kdelibs_export.h: +/opt/kde3/include/tdelibs_export.h: -/opt/kde3/include/kdemacros.h: +/opt/kde3/include/tdemacros.h: configdialog.h: diff --git a/malloryclient/config/.deps/malloryconfig.Plo b/malloryclient/config/.deps/malloryconfig.Plo index c127acc..e5c573d 100644 --- a/malloryclient/config/.deps/malloryconfig.Plo +++ b/malloryclient/config/.deps/malloryconfig.Plo @@ -1,5 +1,5 @@ malloryconfig.lo .libs/malloryconfig.o: malloryconfig.cpp \ - /opt/kde3/include/kconfig.h /usr/lib/qt3/include/ntqvaluelist.h \ + /opt/kde3/include/tdeconfig.h /usr/lib/qt3/include/ntqvaluelist.h \ /usr/lib/qt3/include/ntqtl.h /usr/lib/qt3/include/ntqglobal.h \ /usr/lib/qt3/include/ntqconfig.h /usr/lib/qt3/include/ntqmodules.h \ /usr/lib/qt3/include/ntqfeatures.h /usr/lib/qt3/include/ntqtextstream.h \ @@ -96,7 +96,7 @@ malloryconfig.lo .libs/malloryconfig.o: malloryconfig.cpp \ /usr/include/g++/istream /usr/include/g++/bits/istream.tcc \ /usr/include/g++/bits/stream_iterator.h /usr/include/g++/list \ /usr/include/g++/bits/stl_list.h /usr/include/g++/bits/list.tcc \ - /opt/kde3/include/kconfigbase.h /usr/lib/qt3/include/ntqobject.h \ + /opt/kde3/include/tdeconfigbase.h /usr/lib/qt3/include/ntqobject.h \ /usr/lib/qt3/include/ntqobjectdefs.h /usr/lib/qt3/include/ntqwindowdefs.h \ /usr/lib/qt3/include/ntqnamespace.h /usr/lib/qt3/include/ntqevent.h \ /usr/lib/qt3/include/ntqregion.h /usr/lib/qt3/include/ntqrect.h \ @@ -109,10 +109,10 @@ malloryconfig.lo .libs/malloryconfig.o: malloryconfig.cpp \ /usr/lib/qt3/include/ntqptrlist.h /usr/lib/qt3/include/ntqglist.h \ /usr/lib/qt3/include/ntqptrcollection.h /usr/lib/qt3/include/ntqfont.h \ /usr/lib/qt3/include/ntqdatetime.h /usr/lib/qt3/include/ntqvariant.h \ - /opt/kde3/include/kconfigdata.h /opt/kde3/include/kdelibs_export.h \ - /opt/kde3/include/kdemacros.h /opt/kde3/include/klockfile.h \ - /opt/kde3/include/ksharedptr.h /opt/kde3/include/klocale.h \ - /opt/kde3/include/kglobal.h /opt/kde3/include/kinstance.h \ + /opt/kde3/include/tdeconfigdata.h /opt/kde3/include/tdelibs_export.h \ + /opt/kde3/include/tdemacros.h /opt/kde3/include/klockfile.h \ + /opt/kde3/include/ksharedptr.h /opt/kde3/include/tdelocale.h \ + /opt/kde3/include/tdeglobal.h /opt/kde3/include/kinstance.h \ /usr/lib/qt3/include/ntqcheckbox.h /usr/lib/qt3/include/ntqbutton.h \ /usr/lib/qt3/include/ntqwidget.h /usr/lib/qt3/include/ntqpaintdevice.h \ /usr/lib/qt3/include/ntqpalette.h /usr/lib/qt3/include/ntqbrush.h \ @@ -129,7 +129,7 @@ malloryconfig.lo .libs/malloryconfig.o: malloryconfig.cpp \ /usr/lib/qt3/include/private/qucomextra_p.h \ /usr/lib/qt3/include/private/qucom_p.h /usr/lib/qt3/include/ntquuid.h -/opt/kde3/include/kconfig.h: +/opt/kde3/include/tdeconfig.h: /usr/lib/qt3/include/ntqvaluelist.h: @@ -467,7 +467,7 @@ malloryconfig.lo .libs/malloryconfig.o: malloryconfig.cpp \ /usr/include/g++/bits/list.tcc: -/opt/kde3/include/kconfigbase.h: +/opt/kde3/include/tdeconfigbase.h: /usr/lib/qt3/include/ntqobject.h: @@ -519,19 +519,19 @@ malloryconfig.lo .libs/malloryconfig.o: malloryconfig.cpp \ /usr/lib/qt3/include/ntqvariant.h: -/opt/kde3/include/kconfigdata.h: +/opt/kde3/include/tdeconfigdata.h: -/opt/kde3/include/kdelibs_export.h: +/opt/kde3/include/tdelibs_export.h: -/opt/kde3/include/kdemacros.h: +/opt/kde3/include/tdemacros.h: /opt/kde3/include/klockfile.h: /opt/kde3/include/ksharedptr.h: -/opt/kde3/include/klocale.h: +/opt/kde3/include/tdelocale.h: -/opt/kde3/include/kglobal.h: +/opt/kde3/include/tdeglobal.h: /opt/kde3/include/kinstance.h: diff --git a/malloryclient/config/Makefile b/malloryclient/config/Makefile index 27dbc4c..fa14fbb 100644 --- a/malloryclient/config/Makefile +++ b/malloryclient/config/Makefile @@ -106,7 +106,7 @@ JAR = @JAR@ JAVAC = @JAVAC@ JAVAH = @JAVAH@ JVMLIBS = @JVMLIBS@ -KDECONFIG = /opt/kde3/bin/kde-config +KDECONFIG = /opt/kde3/bin/tde-config KDE_EXTRA_RPATH = KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ KDE_HAVE_DOT = @KDE_HAVE_DOT@ @@ -151,18 +151,18 @@ LIBUTIL = -lutil LIBZ = -lz LIB_JASPER = @LIB_JASPER@ LIB_KAB = -lkab -LIB_KABC = -lkabc -LIB_KDECORE = -lkdecore -LIB_KDEPRINT = -lkdeprint -LIB_KDEUI = -lkdeui -LIB_KFILE = -lkio +LIB_KABC = -ltdeabc +LIB_TDECORE = -ltdecore +LIB_TDEPRINT = -ltdeprint +LIB_TDEUI = -ltdeui +LIB_KFILE = -ltdeio LIB_KFM = -LIB_KHTML = -lkhtml +LIB_TDEHTML = -ltdehtml LIB_KIMGIO = @LIB_KIMGIO@ -LIB_KIO = -lkio -LIB_KPARTS = -lkparts -LIB_KSPELL = -lkspell -LIB_KSYCOCA = -lkio +LIB_TDEIO = -ltdeio +LIB_TDEPARTS = -ltdeparts +LIB_TDESPELL = -ltdespell +LIB_TDESYCOCA = -ltdeio LIB_POLL = LIB_QPE = LIB_QT = -ltqt-mt $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread @@ -245,7 +245,7 @@ kde_styledir = ${libdir}/kde3/plugins/styles kde_templatesdir = ${prefix}/share/templates kde_wallpaperdir = ${prefix}/share/wallpapers kde_widgetdir = /opt/kde3/lib/kde3/plugins/designer -kdeinitdir = $(kde_moduledir) +tdeinitdir = $(kde_moduledir) micodir = @micodir@ qt_includes = /usr/lib/qt3/include qt_libraries = /usr/lib/qt3/lib @@ -255,34 +255,34 @@ xdg_appsdir = ${datadir}/applications xdg_directorydir = ${datadir}/desktop-directories INCLUDES = $(all_includes) -kde_module_LTLIBRARIES = kwin_mallory_config.la +kde_module_LTLIBRARIES = twin_mallory_config.la -#>- kwin_mallory_config_la_SOURCES = malloryconfig.cpp configdialog.ui +#>- twin_mallory_config_la_SOURCES = malloryconfig.cpp configdialog.ui #>+ 1 -kwin_mallory_config_la_SOURCES=malloryconfig.cpp configdialog.cpp -kwin_mallory_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin_mallory_config_la_LIBADD = $(LIB_KDEUI) +twin_mallory_config_la_SOURCES=malloryconfig.cpp configdialog.cpp +twin_mallory_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_mallory_config_la_LIBADD = $(LIB_TDEUI) #>- METASOURCES = AUTO # noinst_HEADERS = malloryconfig.h configdialog.h noinst_HEADERS = malloryconfig.h DISTCLEANFILES = $(METASOURCES) -lnkdir = $(kde_datadir)/kwin +lnkdir = $(kde_datadir)/twin subdir = malloryclient/config mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) -kwin_mallory_config_la_DEPENDENCIES = -am_kwin_mallory_config_la_OBJECTS = malloryconfig.lo -#>- kwin_mallory_config_la_OBJECTS = $(am_kwin_mallory_config_la_OBJECTS) +twin_mallory_config_la_DEPENDENCIES = +am_twin_mallory_config_la_OBJECTS = malloryconfig.lo +#>- twin_mallory_config_la_OBJECTS = $(am_twin_mallory_config_la_OBJECTS) #>+ 4 -kwin_mallory_config_la_final_OBJECTS = kwin_mallory_config_la.all_cpp.lo -kwin_mallory_config_la_nofinal_OBJECTS = malloryconfig.lo configdialog.lo -kwin_mallory_config_la_OBJECTS = $(kwin_mallory_config_la_nofinal_OBJECTS) -#kwin_mallory_config_la_OBJECTS = $(kwin_mallory_config_la_final_OBJECTS) +twin_mallory_config_la_final_OBJECTS = twin_mallory_config_la.all_cpp.lo +twin_mallory_config_la_nofinal_OBJECTS = malloryconfig.lo configdialog.lo +twin_mallory_config_la_OBJECTS = $(twin_mallory_config_la_nofinal_OBJECTS) +#twin_mallory_config_la_OBJECTS = $(twin_mallory_config_la_final_OBJECTS) DEFS = -DHAVE_CONFIG_H DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) @@ -293,7 +293,7 @@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- DEP_FILES = ./$(DEPDIR)/malloryconfig.Plo #>+ 3 -#DEP_FILES = $(DEPDIR)/configdialog.P $(DEPDIR)/kwin_mallory_config_la.all_cpp.P ./$(DEPDIR)/malloryconfig.Plo +#DEP_FILES = $(DEPDIR)/configdialog.P $(DEPDIR)/twin_mallory_config_la.all_cpp.P ./$(DEPDIR)/malloryconfig.Plo DEP_FILES = $(DEPDIR)/configdialog.P ./$(DEPDIR)/malloryconfig.Plo #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -315,11 +315,11 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic -W -Wpointer-arith -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -O2 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common -DIST_SOURCES = $(kwin_mallory_config_la_SOURCES) +DIST_SOURCES = $(twin_mallory_config_la_SOURCES) HEADERS = $(noinst_HEADERS) DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in -SOURCES = $(kwin_mallory_config_la_SOURCES) +SOURCES = $(twin_mallory_config_la_SOURCES) #>- all: all-am #>+ 1 @@ -364,11 +364,11 @@ clean-kde_moduleLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -#>- kwin_mallory_config.la: $(kwin_mallory_config_la_OBJECTS) $(kwin_mallory_config_la_DEPENDENCIES) +#>- twin_mallory_config.la: $(twin_mallory_config_la_OBJECTS) $(twin_mallory_config_la_DEPENDENCIES) #>+ 2 -kwin_mallory_config.la: kwin_mallory_config.la.closure $(kwin_mallory_config_la_OBJECTS) $(kwin_mallory_config_la_DEPENDENCIES) -#kwin_mallory_config.la: $(kwin_mallory_config_la_OBJECTS) $(kwin_mallory_config_la_DEPENDENCIES) - $(CXXLINK) -rpath $(kde_moduledir) $(kwin_mallory_config_la_LDFLAGS) $(kwin_mallory_config_la_OBJECTS) $(kwin_mallory_config_la_LIBADD) $(LIBS) +twin_mallory_config.la: twin_mallory_config.la.closure $(twin_mallory_config_la_OBJECTS) $(twin_mallory_config_la_DEPENDENCIES) +#twin_mallory_config.la: $(twin_mallory_config_la_OBJECTS) $(twin_mallory_config_la_DEPENDENCIES) + $(CXXLINK) -rpath $(kde_moduledir) $(twin_mallory_config_la_LDFLAGS) $(twin_mallory_config_la_OBJECTS) $(twin_mallory_config_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) core *.core @@ -570,7 +570,7 @@ uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES messages: - $(XGETTEXT) *.cpp -o $(podir)/kwin_mallory_config.pot + $(XGETTEXT) *.cpp -o $(podir)/twin_mallory_config.pot # AUTOMAKE_OPTIONS = foreign # @@ -580,33 +580,33 @@ messages: # # noinst_HEADERS = malloryconfig.h configdialog.h # -# kde_module_LTLIBRARIES = kwin_mallory_config.la -# kwin_mallory_config_la_SOURCES = malloryconfig.cpp configdialog.ui -# kwin_mallory_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -# kwin_mallory_config_la_LIBADD = $(LIB_KDEUI) -# kwin_mallory_config_la_METASOURCES = AUTO +# kde_module_LTLIBRARIES = twin_mallory_config.la +# twin_mallory_config_la_SOURCES = malloryconfig.cpp configdialog.ui +# twin_mallory_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +# twin_mallory_config_la_LIBADD = $(LIB_TDEUI) +# twin_mallory_config_la_METASOURCES = AUTO # -# DISTCLEANFILES = $(kwin_mallory_la_METASOURCES) +# DISTCLEANFILES = $(twin_mallory_la_METASOURCES) # # messages: -# $(XGETTEXT) *.cpp -o $(podir)/kwin_mallory_config.pot +# $(XGETTEXT) *.cpp -o $(podir)/twin_mallory_config.pot # 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: #>+ 8 -kwin_mallory_config.la.closure: $(kwin_mallory_config_la_OBJECTS) $(kwin_mallory_config_la_DEPENDENCIES) - @echo "int main() {return 0;}" > kwin_mallory_config_la_closure.cpp - @$(LTCXXCOMPILE) -c kwin_mallory_config_la_closure.cpp - $(CXXLINK) kwin_mallory_config_la_closure.lo $(kwin_mallory_config_la_LDFLAGS) $(kwin_mallory_config_la_OBJECTS) $(kwin_mallory_config_la_LIBADD) $(LIBS) - @rm -f kwin_mallory_config_la_closure.* kwin_mallory_config.la.closure - @echo "timestamp" > kwin_mallory_config.la.closure +twin_mallory_config.la.closure: $(twin_mallory_config_la_OBJECTS) $(twin_mallory_config_la_DEPENDENCIES) + @echo "int main() {return 0;}" > twin_mallory_config_la_closure.cpp + @$(LTCXXCOMPILE) -c twin_mallory_config_la_closure.cpp + $(CXXLINK) twin_mallory_config_la_closure.lo $(twin_mallory_config_la_LDFLAGS) $(twin_mallory_config_la_OBJECTS) $(twin_mallory_config_la_LIBADD) $(LIBS) + @rm -f twin_mallory_config_la_closure.* twin_mallory_config.la.closure + @echo "timestamp" > twin_mallory_config.la.closure #>+ 14 configdialog.cpp: $(srcdir)/configdialog.ui configdialog.h configdialog.moc rm -f configdialog.cpp - echo '#include <klocale.h>' > configdialog.cpp + echo '#include <tdelocale.h>' > configdialog.cpp $(UIC) -tr ${UIC_TR} -i configdialog.h $(srcdir)/configdialog.ui > configdialog.cpp.temp ; ret=$$?; \ sed -e "s,${UIC_TR}( \"\" ),QString::null,g" configdialog.cpp.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_configdialog,g" >> configdialog.cpp ;\ rm -f configdialog.cpp.temp ;\ @@ -635,7 +635,7 @@ clean-ui: #>+ 3 clean-closures: - -rm -f kwin_mallory_config.la.closure + -rm -f twin_mallory_config.la.closure #>+ 2 docs-am: @@ -669,33 +669,33 @@ bcheck-am: #>+ 11 -kwin_mallory_config_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/malloryconfig.cpp configdialog.cpp malloryconfig.moc configdialog.moc - @echo 'creating kwin_mallory_config_la.all_cpp.cpp ...'; \ - rm -f kwin_mallory_config_la.all_cpp.files kwin_mallory_config_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kwin_mallory_config_la.all_cpp.final; \ +twin_mallory_config_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/malloryconfig.cpp configdialog.cpp malloryconfig.moc configdialog.moc + @echo 'creating twin_mallory_config_la.all_cpp.cpp ...'; \ + rm -f twin_mallory_config_la.all_cpp.files twin_mallory_config_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> twin_mallory_config_la.all_cpp.final; \ for file in malloryconfig.cpp configdialog.cpp ; do \ - echo "#include \"$$file\"" >> kwin_mallory_config_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwin_mallory_config_la.all_cpp.final; \ + echo "#include \"$$file\"" >> twin_mallory_config_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> twin_mallory_config_la.all_cpp.final; \ done; \ - cat kwin_mallory_config_la.all_cpp.final kwin_mallory_config_la.all_cpp.files > kwin_mallory_config_la.all_cpp.cpp; \ - rm -f kwin_mallory_config_la.all_cpp.final kwin_mallory_config_la.all_cpp.files + cat twin_mallory_config_la.all_cpp.final twin_mallory_config_la.all_cpp.files > twin_mallory_config_la.all_cpp.cpp; \ + rm -f twin_mallory_config_la.all_cpp.final twin_mallory_config_la.all_cpp.files #>+ 3 clean-final: - -rm -f kwin_mallory_config_la.all_cpp.cpp + -rm -f twin_mallory_config_la.all_cpp.cpp #>+ 2 final: - $(MAKE) kwin_mallory_config_la_OBJECTS="$(kwin_mallory_config_la_final_OBJECTS)" all-am + $(MAKE) twin_mallory_config_la_OBJECTS="$(twin_mallory_config_la_final_OBJECTS)" all-am #>+ 2 final-install: - $(MAKE) kwin_mallory_config_la_OBJECTS="$(kwin_mallory_config_la_final_OBJECTS)" install-am + $(MAKE) twin_mallory_config_la_OBJECTS="$(twin_mallory_config_la_final_OBJECTS)" install-am #>+ 2 no-final: - $(MAKE) kwin_mallory_config_la_OBJECTS="$(kwin_mallory_config_la_nofinal_OBJECTS)" all-am + $(MAKE) twin_mallory_config_la_OBJECTS="$(twin_mallory_config_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: - $(MAKE) kwin_mallory_config_la_OBJECTS="$(kwin_mallory_config_la_nofinal_OBJECTS)" install-am + $(MAKE) twin_mallory_config_la_OBJECTS="$(twin_mallory_config_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/malloryclient/config/Makefile.am b/malloryclient/config/Makefile.am index c02605b..b3bdfd1 100644 --- a/malloryclient/config/Makefile.am +++ b/malloryclient/config/Makefile.am @@ -1,20 +1,20 @@ INCLUDES = $(all_includes) -kde_module_LTLIBRARIES = kwin_mallory_config.la +kde_module_LTLIBRARIES = twin_mallory_config.la -kwin_mallory_config_la_SOURCES = malloryconfig.cpp configdialog.ui -kwin_mallory_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin_mallory_config_la_LIBADD = $(LIB_KDEUI) +twin_mallory_config_la_SOURCES = malloryconfig.cpp configdialog.ui +twin_mallory_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_mallory_config_la_LIBADD = $(LIB_TDEUI) METASOURCES = AUTO # noinst_HEADERS = malloryconfig.h configdialog.h noinst_HEADERS = malloryconfig.h DISTCLEANFILES = $(METASOURCES) -lnkdir = $(kde_datadir)/kwin +lnkdir = $(kde_datadir)/twin messages: - $(XGETTEXT) *.cpp -o $(podir)/kwin_mallory_config.pot + $(XGETTEXT) *.cpp -o $(podir)/twin_mallory_config.pot # AUTOMAKE_OPTIONS = foreign # @@ -24,13 +24,13 @@ messages: # # noinst_HEADERS = malloryconfig.h configdialog.h # -# kde_module_LTLIBRARIES = kwin_mallory_config.la -# kwin_mallory_config_la_SOURCES = malloryconfig.cpp configdialog.ui -# kwin_mallory_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -# kwin_mallory_config_la_LIBADD = $(LIB_KDEUI) -# kwin_mallory_config_la_METASOURCES = AUTO +# kde_module_LTLIBRARIES = twin_mallory_config.la +# twin_mallory_config_la_SOURCES = malloryconfig.cpp configdialog.ui +# twin_mallory_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +# twin_mallory_config_la_LIBADD = $(LIB_TDEUI) +# twin_mallory_config_la_METASOURCES = AUTO # -# DISTCLEANFILES = $(kwin_mallory_la_METASOURCES) +# DISTCLEANFILES = $(twin_mallory_la_METASOURCES) # # messages: -# $(XGETTEXT) *.cpp -o $(podir)/kwin_mallory_config.pot +# $(XGETTEXT) *.cpp -o $(podir)/twin_mallory_config.pot diff --git a/malloryclient/config/Makefile.in b/malloryclient/config/Makefile.in index d22a8b8..a74c1ab 100644 --- a/malloryclient/config/Makefile.in +++ b/malloryclient/config/Makefile.in @@ -151,17 +151,17 @@ LIBZ = @LIBZ@ LIB_JASPER = @LIB_JASPER@ LIB_KAB = @LIB_KAB@ LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ +LIB_TDECORE = @LIB_TDECORE@ +LIB_TDEPRINT = @LIB_TDEPRINT@ +LIB_TDEUI = @LIB_TDEUI@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ +LIB_TDEHTML = @LIB_TDEHTML@ LIB_KIMGIO = @LIB_KIMGIO@ -LIB_KIO = @LIB_KIO@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ +LIB_TDEIO = @LIB_TDEIO@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ @@ -244,7 +244,7 @@ kde_styledir = @kde_styledir@ kde_templatesdir = @kde_templatesdir@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ +tdeinitdir = @tdeinitdir@ micodir = @micodir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ @@ -254,34 +254,34 @@ xdg_appsdir = @xdg_appsdir@ xdg_directorydir = @xdg_directorydir@ INCLUDES = $(all_includes) -kde_module_LTLIBRARIES = kwin_mallory_config.la +kde_module_LTLIBRARIES = twin_mallory_config.la -#>- kwin_mallory_config_la_SOURCES = malloryconfig.cpp configdialog.ui +#>- twin_mallory_config_la_SOURCES = malloryconfig.cpp configdialog.ui #>+ 1 -kwin_mallory_config_la_SOURCES=malloryconfig.cpp configdialog.cpp -kwin_mallory_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin_mallory_config_la_LIBADD = $(LIB_KDEUI) +twin_mallory_config_la_SOURCES=malloryconfig.cpp configdialog.cpp +twin_mallory_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_mallory_config_la_LIBADD = $(LIB_TDEUI) #>- METASOURCES = AUTO # noinst_HEADERS = malloryconfig.h configdialog.h noinst_HEADERS = malloryconfig.h DISTCLEANFILES = $(METASOURCES) -lnkdir = $(kde_datadir)/kwin +lnkdir = $(kde_datadir)/twin subdir = malloryclient/config mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) -kwin_mallory_config_la_DEPENDENCIES = -am_kwin_mallory_config_la_OBJECTS = malloryconfig.lo -#>- kwin_mallory_config_la_OBJECTS = $(am_kwin_mallory_config_la_OBJECTS) +twin_mallory_config_la_DEPENDENCIES = +am_twin_mallory_config_la_OBJECTS = malloryconfig.lo +#>- twin_mallory_config_la_OBJECTS = $(am_twin_mallory_config_la_OBJECTS) #>+ 4 -kwin_mallory_config_la_final_OBJECTS = kwin_mallory_config_la.all_cpp.lo -kwin_mallory_config_la_nofinal_OBJECTS = malloryconfig.lo configdialog.lo -@KDE_USE_FINAL_FALSE@kwin_mallory_config_la_OBJECTS = $(kwin_mallory_config_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kwin_mallory_config_la_OBJECTS = $(kwin_mallory_config_la_final_OBJECTS) +twin_mallory_config_la_final_OBJECTS = twin_mallory_config_la.all_cpp.lo +twin_mallory_config_la_nofinal_OBJECTS = malloryconfig.lo configdialog.lo +@KDE_USE_FINAL_FALSE@twin_mallory_config_la_OBJECTS = $(twin_mallory_config_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@twin_mallory_config_la_OBJECTS = $(twin_mallory_config_la_final_OBJECTS) DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) @@ -292,7 +292,7 @@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/malloryconfig.Plo #>+ 3 -@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/configdialog.P $(DEPDIR)/kwin_mallory_config_la.all_cpp.P ./$(DEPDIR)/malloryconfig.Plo +@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/configdialog.P $(DEPDIR)/twin_mallory_config_la.all_cpp.P ./$(DEPDIR)/malloryconfig.Plo @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/configdialog.P ./$(DEPDIR)/malloryconfig.Plo #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -314,11 +314,11 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ -DIST_SOURCES = $(kwin_mallory_config_la_SOURCES) +DIST_SOURCES = $(twin_mallory_config_la_SOURCES) HEADERS = $(noinst_HEADERS) DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in -SOURCES = $(kwin_mallory_config_la_SOURCES) +SOURCES = $(twin_mallory_config_la_SOURCES) #>- all: all-am #>+ 1 @@ -363,11 +363,11 @@ clean-kde_moduleLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -#>- kwin_mallory_config.la: $(kwin_mallory_config_la_OBJECTS) $(kwin_mallory_config_la_DEPENDENCIES) +#>- twin_mallory_config.la: $(twin_mallory_config_la_OBJECTS) $(twin_mallory_config_la_DEPENDENCIES) #>+ 2 -@KDE_USE_CLOSURE_TRUE@kwin_mallory_config.la: kwin_mallory_config.la.closure $(kwin_mallory_config_la_OBJECTS) $(kwin_mallory_config_la_DEPENDENCIES) -@KDE_USE_CLOSURE_FALSE@kwin_mallory_config.la: $(kwin_mallory_config_la_OBJECTS) $(kwin_mallory_config_la_DEPENDENCIES) - $(CXXLINK) -rpath $(kde_moduledir) $(kwin_mallory_config_la_LDFLAGS) $(kwin_mallory_config_la_OBJECTS) $(kwin_mallory_config_la_LIBADD) $(LIBS) +@KDE_USE_CLOSURE_TRUE@twin_mallory_config.la: twin_mallory_config.la.closure $(twin_mallory_config_la_OBJECTS) $(twin_mallory_config_la_DEPENDENCIES) +@KDE_USE_CLOSURE_FALSE@twin_mallory_config.la: $(twin_mallory_config_la_OBJECTS) $(twin_mallory_config_la_DEPENDENCIES) + $(CXXLINK) -rpath $(kde_moduledir) $(twin_mallory_config_la_LDFLAGS) $(twin_mallory_config_la_OBJECTS) $(twin_mallory_config_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) core *.core @@ -569,7 +569,7 @@ uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES messages: - $(XGETTEXT) *.cpp -o $(podir)/kwin_mallory_config.pot + $(XGETTEXT) *.cpp -o $(podir)/twin_mallory_config.pot # AUTOMAKE_OPTIONS = foreign # @@ -579,33 +579,33 @@ messages: # # noinst_HEADERS = malloryconfig.h configdialog.h # -# kde_module_LTLIBRARIES = kwin_mallory_config.la -# kwin_mallory_config_la_SOURCES = malloryconfig.cpp configdialog.ui -# kwin_mallory_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -# kwin_mallory_config_la_LIBADD = $(LIB_KDEUI) -# kwin_mallory_config_la_METASOURCES = AUTO +# kde_module_LTLIBRARIES = twin_mallory_config.la +# twin_mallory_config_la_SOURCES = malloryconfig.cpp configdialog.ui +# twin_mallory_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +# twin_mallory_config_la_LIBADD = $(LIB_TDEUI) +# twin_mallory_config_la_METASOURCES = AUTO # -# DISTCLEANFILES = $(kwin_mallory_la_METASOURCES) +# DISTCLEANFILES = $(twin_mallory_la_METASOURCES) # # messages: -# $(XGETTEXT) *.cpp -o $(podir)/kwin_mallory_config.pot +# $(XGETTEXT) *.cpp -o $(podir)/twin_mallory_config.pot # 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: #>+ 8 -kwin_mallory_config.la.closure: $(kwin_mallory_config_la_OBJECTS) $(kwin_mallory_config_la_DEPENDENCIES) - @echo "int main() {return 0;}" > kwin_mallory_config_la_closure.cpp - @$(LTCXXCOMPILE) -c kwin_mallory_config_la_closure.cpp - $(CXXLINK) kwin_mallory_config_la_closure.lo $(kwin_mallory_config_la_LDFLAGS) $(kwin_mallory_config_la_OBJECTS) $(kwin_mallory_config_la_LIBADD) $(LIBS) - @rm -f kwin_mallory_config_la_closure.* kwin_mallory_config.la.closure - @echo "timestamp" > kwin_mallory_config.la.closure +twin_mallory_config.la.closure: $(twin_mallory_config_la_OBJECTS) $(twin_mallory_config_la_DEPENDENCIES) + @echo "int main() {return 0;}" > twin_mallory_config_la_closure.cpp + @$(LTCXXCOMPILE) -c twin_mallory_config_la_closure.cpp + $(CXXLINK) twin_mallory_config_la_closure.lo $(twin_mallory_config_la_LDFLAGS) $(twin_mallory_config_la_OBJECTS) $(twin_mallory_config_la_LIBADD) $(LIBS) + @rm -f twin_mallory_config_la_closure.* twin_mallory_config.la.closure + @echo "timestamp" > twin_mallory_config.la.closure #>+ 14 configdialog.cpp: $(srcdir)/configdialog.ui configdialog.h configdialog.moc rm -f configdialog.cpp - echo '#include <klocale.h>' > configdialog.cpp + echo '#include <tdelocale.h>' > configdialog.cpp $(UIC) -tr ${UIC_TR} -i configdialog.h $(srcdir)/configdialog.ui > configdialog.cpp.temp ; ret=$$?; \ sed -e "s,${UIC_TR}( \"\" ),QString::null,g" configdialog.cpp.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_configdialog,g" >> configdialog.cpp ;\ rm -f configdialog.cpp.temp ;\ @@ -634,7 +634,7 @@ clean-ui: #>+ 3 clean-closures: - -rm -f kwin_mallory_config.la.closure + -rm -f twin_mallory_config.la.closure #>+ 2 docs-am: @@ -668,33 +668,33 @@ bcheck-am: #>+ 11 -kwin_mallory_config_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/malloryconfig.cpp configdialog.cpp malloryconfig.moc configdialog.moc - @echo 'creating kwin_mallory_config_la.all_cpp.cpp ...'; \ - rm -f kwin_mallory_config_la.all_cpp.files kwin_mallory_config_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kwin_mallory_config_la.all_cpp.final; \ +twin_mallory_config_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/malloryconfig.cpp configdialog.cpp malloryconfig.moc configdialog.moc + @echo 'creating twin_mallory_config_la.all_cpp.cpp ...'; \ + rm -f twin_mallory_config_la.all_cpp.files twin_mallory_config_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> twin_mallory_config_la.all_cpp.final; \ for file in malloryconfig.cpp configdialog.cpp ; do \ - echo "#include \"$$file\"" >> kwin_mallory_config_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwin_mallory_config_la.all_cpp.final; \ + echo "#include \"$$file\"" >> twin_mallory_config_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> twin_mallory_config_la.all_cpp.final; \ done; \ - cat kwin_mallory_config_la.all_cpp.final kwin_mallory_config_la.all_cpp.files > kwin_mallory_config_la.all_cpp.cpp; \ - rm -f kwin_mallory_config_la.all_cpp.final kwin_mallory_config_la.all_cpp.files + cat twin_mallory_config_la.all_cpp.final twin_mallory_config_la.all_cpp.files > twin_mallory_config_la.all_cpp.cpp; \ + rm -f twin_mallory_config_la.all_cpp.final twin_mallory_config_la.all_cpp.files #>+ 3 clean-final: - -rm -f kwin_mallory_config_la.all_cpp.cpp + -rm -f twin_mallory_config_la.all_cpp.cpp #>+ 2 final: - $(MAKE) kwin_mallory_config_la_OBJECTS="$(kwin_mallory_config_la_final_OBJECTS)" all-am + $(MAKE) twin_mallory_config_la_OBJECTS="$(twin_mallory_config_la_final_OBJECTS)" all-am #>+ 2 final-install: - $(MAKE) kwin_mallory_config_la_OBJECTS="$(kwin_mallory_config_la_final_OBJECTS)" install-am + $(MAKE) twin_mallory_config_la_OBJECTS="$(twin_mallory_config_la_final_OBJECTS)" install-am #>+ 2 no-final: - $(MAKE) kwin_mallory_config_la_OBJECTS="$(kwin_mallory_config_la_nofinal_OBJECTS)" all-am + $(MAKE) twin_mallory_config_la_OBJECTS="$(twin_mallory_config_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: - $(MAKE) kwin_mallory_config_la_OBJECTS="$(kwin_mallory_config_la_nofinal_OBJECTS)" install-am + $(MAKE) twin_mallory_config_la_OBJECTS="$(twin_mallory_config_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/malloryclient/config/malloryconfig.cpp b/malloryclient/config/malloryconfig.cpp index 8626ec4..c482ff3 100644 --- a/malloryclient/config/malloryconfig.cpp +++ b/malloryclient/config/malloryconfig.cpp @@ -7,9 +7,9 @@ * (at your option) any later version. * ***************************************************************************/ -#include <kconfig.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdeconfig.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <ntqcheckbox.h> #include <ntqslider.h> #include <ntqspinbox.h> @@ -19,12 +19,12 @@ #include "malloryconfig.h" #include "configdialog.h" -MalloryConfig::MalloryConfig(KConfig* config, TQWidget* parent) +MalloryConfig::MalloryConfig(TDEConfig* config, TQWidget* parent) : TQObject(parent), m_config(0), m_dialog(0) { // Create the configuration object. - m_config = new KConfig("kwinmalloryrc"); - KGlobal::locale()->insertCatalogue("kwin_mallory_config"); + m_config = new TDEConfig("twinmalloryrc"); + TDEGlobal::locale()->insertCatalogue("twin_mallory_config"); // Create and show the configuration dialog. m_dialog = new ConfigDialog(parent); @@ -52,7 +52,7 @@ MalloryConfig::~MalloryConfig() if (m_config) delete m_config; } -void MalloryConfig::load(KConfig*) +void MalloryConfig::load(TDEConfig*) { m_config->setGroup("General"); @@ -76,7 +76,7 @@ void MalloryConfig::load(KConfig*) m_dialog->m_titleShadowSize->setValue(titleShadowSize); } -void MalloryConfig::save(KConfig*) +void MalloryConfig::save(TDEConfig*) { m_config->setGroup("General"); @@ -111,7 +111,7 @@ void MalloryConfig::defaults() extern "C" { - TQObject* allocate_config(KConfig* config, TQWidget* parent) { + TQObject* allocate_config(TDEConfig* config, TQWidget* parent) { return (new MalloryConfig(config, parent)); } } diff --git a/malloryclient/config/malloryconfig.h b/malloryclient/config/malloryconfig.h index fee108f..64b3095 100644 --- a/malloryclient/config/malloryconfig.h +++ b/malloryclient/config/malloryconfig.h @@ -15,26 +15,26 @@ class TQButtonGroup; class TQGroupBox; class TQComboBox; -class KConfig; +class TDEConfig; class ConfigDialog; class MalloryConfig : public TQObject { Q_OBJECT public: - MalloryConfig(KConfig* config, TQWidget* parent); ///< Constructor + MalloryConfig(TDEConfig* config, TQWidget* parent); ///< Constructor ~MalloryConfig(); ///< Destructor signals: void changed(); ///< Widget state has changed public slots: - void load(KConfig *config); ///< Load configuration data - void save(KConfig *config); ///< Save configuration data + void load(TDEConfig *config); ///< Load configuration data + void save(TDEConfig *config); ///< Save configuration data void defaults(); ///< Set configuration defaults private: - KConfig *m_config; + TDEConfig *m_config; ConfigDialog *m_dialog; }; diff --git a/malloryclient/mallory.desktop b/malloryclient/mallory.desktop index d3666d2..2a82b26 100644 --- a/malloryclient/mallory.desktop +++ b/malloryclient/mallory.desktop @@ -2,4 +2,4 @@ [Desktop Entry] Encoding=UTF-8 Name=Mallory -X-KDE-Library=kwin3_mallory +X-TDE-Library=twin3_mallory diff --git a/malloryclient/malloryclient.cpp b/malloryclient/malloryclient.cpp index 9c3ab25..9c2f2d6 100644 --- a/malloryclient/malloryclient.cpp +++ b/malloryclient/malloryclient.cpp @@ -10,7 +10,7 @@ // // -#include <klocale.h> +#include <tdelocale.h> #include <kpixmap.h> #include <kpixmapeffect.h> diff --git a/malloryclient/malloryhandler.cpp b/malloryclient/malloryhandler.cpp index 51e1709..d63618d 100644 --- a/malloryclient/malloryhandler.cpp +++ b/malloryclient/malloryhandler.cpp @@ -58,7 +58,7 @@ KDecoration* MalloryHandler::createDecoration(KDecorationBridge *bridge) void MalloryHandler::readConfig() { - KConfig config("kwinmalloryrc"); + TDEConfig config("twinmalloryrc"); config.setGroup("General"); m_titleShadow = config.readBoolEntry("TitleShadow", true); diff --git a/malloryclient/malloryhandler.h b/malloryclient/malloryhandler.h index c14bf26..5b75f31 100644 --- a/malloryclient/malloryhandler.h +++ b/malloryclient/malloryhandler.h @@ -15,7 +15,7 @@ #include <kdecorationfactory.h> #include <kdecoration.h> #include <tqobject.h> -#include <kconfig.h> +#include <tdeconfig.h> // Default button layout const char default_left[] = "M"; |