From c3b78c84d83b7d815961e2bfc831faaac415aa0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 3 Sep 2013 19:58:05 +0200 Subject: Additional k => tde renaming and fixes --- FAQ | 4 ++-- README | 2 +- acinclude.m4 | 24 ++++++++++++------------ admin | 2 +- configure.in | 6 +++--- configure.in.in | 8 ++++---- doc/en/credits.docbook | 2 +- doc/en/faq.docbook | 4 ++-- doc/en/glossary.docbook | 4 ++-- doc/en/index.docbook | 2 +- doc/en/user-interface.docbook | 2 +- doc/ru/credits.docbook | 2 +- doc/ru/faq.docbook | 4 ++-- doc/update_pot | 2 +- iso/Makefile.am | 2 +- iso/libisofs/Makefile.am | 2 +- krArc/Makefile.am | 2 +- krusader.kdevprj | 2 +- krusader.spec | 2 +- krusader/BookMan/krbookmarkhandler.cpp | 2 +- krusader/Makefile.am | 4 ++-- krusader/Splitter/combiner.cpp | 4 ++-- krusader/Splitter/splitter.cpp | 6 +++--- krusader/VFS/krquery.h | 2 +- krusader/VFS/normal_vfs.cpp | 2 +- krusader/VFS/preservingcopyjob.cpp | 2 +- krusader/main.cpp | 2 +- tar/Makefile.am | 6 +++--- virt/Makefile.am | 4 ++-- 29 files changed, 56 insertions(+), 56 deletions(-) diff --git a/FAQ b/FAQ index 677f5af..1a47d68 100644 --- a/FAQ +++ b/FAQ @@ -470,13 +470,13 @@ Usage FAQ Install the krarc slave properly: Copy the tdeio_krarc.so, tdeio_krarc.la files into $TDEDIR/lib/trinity Copy the krarc.protocol file into $TDEDIR/share/services - or the directory where the KIO slaves are placed in your Linux� + or the directory where the TDEIO slaves are placed in your Linux� distribution. 8. I get the error message "Protocol not supported by Krusader: "krarc:/path/ to/foo-archive", when I try to open foo-Archive, what to do? The icons, tdeio_slaves and documentation must be installed in the correct places in the TDE directory tree. The tdeio_krarc.* files must be in the same - directory with the other KIO slaves. Try this: locate tdeio_tar.* and copy/ + directory with the other TDEIO slaves. Try this: locate tdeio_tar.* and copy/ link the tdeio_krarc.* files to the same location. Don't forget to run # ldconfig on this directory when you're done. For more information click here. diff --git a/README b/README index 195a1a4..c30c3e2 100644 --- a/README +++ b/README @@ -398,7 +398,7 @@ Plus: extensive Archive handling, mounted Filesystem support, FTP, advanced Search module, viewer/Editor, directory Synchronization, file content Comparisons, powerful batch Renaming and much, much more. -It supports a wide variety of archive formats and can handle other KIO +It supports a wide variety of archive formats and can handle other TDEIO slaves such as smb or fish. It is (almost) completely customizable, very user friendly, fast and looks great on your desktop! diff --git a/acinclude.m4 b/acinclude.m4 index 4774ea0..00c3d8a 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2070,35 +2070,35 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_KIO, "-ltdeio") + AC_SUBST(LIB_TDEIO, "-ltdeio") AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEABC, "-ltdeabc") AC_SUBST(LIB_TDEHTML, "-ltdehtml") - AC_SUBST(LIB_KSPELL, "-ltdespell") - AC_SUBST(LIB_KPARTS, "-ltdeparts") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") - AC_SUBST(LIB_KUTILS, "-ltdeutils") + AC_SUBST(LIB_TDEUTILS, "-ltdeutils") AC_SUBST(LIB_TDEPIM, "-ltdepim") - AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") + AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") - AC_SUBST(LIB_KDNSSD, "-ltdednssd") - AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") + AC_SUBST(LIB_TDEDNSSD, "-ltdednssd") + AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest") # these are for backward compatibility - AC_SUBST(LIB_KSYCOCA, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-ltdeio") AC_SUBST(LIB_TDEFILE, "-ltdeio") elif test $kde_qtver = 2; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_KIO, "-ltdeio") - AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") + AC_SUBST(LIB_TDEIO, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_TDEFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEHTML, "-ltdehtml") - AC_SUBST(LIB_KSPELL, "-ltdespell") - AC_SUBST(LIB_KPARTS, "-ltdeparts") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") diff --git a/admin b/admin index b4d585c..6b7f722 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit b4d585c643d92787bfa17b935ce00b09960ee360 +Subproject commit 6b7f7225eff4c49b2dd71804d5fdacb03efcf461 diff --git a/configure.in b/configure.in index 5bb53f8..8dd236a 100644 --- a/configure.in +++ b/configure.in @@ -144,11 +144,11 @@ fi AM_CONDITIONAL(include_libkjsembed, test "$have_libkjsembed" = yes) ################################################### -# If our own tar-KIO schould be build +# If our own tar-TDEIO schould be build ################################################### AC_ARG_WITH(kiotar, - AC_HELP_STRING([--with-kiotar],[use our write-enabled version of KDE's tar KIO-Slave [default=without]]), + AC_HELP_STRING([--with-kiotar],[use our write-enabled version of KDE's tar TDEIO-Slave [default=without]]), [with_tar=$withval], [with_tar=no] ) @@ -281,7 +281,7 @@ if (test $warn_js); fi if (test $with_tar != "no"); - then echo "NOTICE: Our write-enabled version of KDE's tar KIO-Slave will be build. \"make install\" will may overwrite the KDE-version!" + then echo "NOTICE: Our write-enabled version of KDE's tar TDEIO-Slave will be build. \"make install\" will may overwrite the KDE-version!" fi if (test -z "$TDEDIR"); diff --git a/configure.in.in b/configure.in.in index b54a31a..bdd2801 100644 --- a/configure.in.in +++ b/configure.in.in @@ -81,11 +81,11 @@ fi AM_CONDITIONAL(include_libkjsembed, test "$have_libkjsembed" = yes) ################################################### -# If our own tar-KIO should be built +# If our own tar-TDEIO should be built ################################################### AC_ARG_WITH(kiotar, - AC_HELP_STRING([--with-kiotar],[use our write-enabled version of KDE's tar KIO-Slave [default=without]]), + AC_HELP_STRING([--with-kiotar],[use our write-enabled version of KDE's tar TDEIO-Slave [default=without]]), [with_tar=$withval], [with_tar=no] ) @@ -95,11 +95,11 @@ AM_CONDITIONAL(with_tar, test "$with_tar" != "no") ################################################### ################################################### -# If our own iso-KIO should be built +# If our own iso-TDEIO should be built ################################################### AC_ARG_WITH(kioiso, - AC_HELP_STRING([--with-kioiso],[use our version of Trinity's iso KIO-slave [default=without]]), + AC_HELP_STRING([--with-kioiso],[use our version of Trinity's iso TDEIO-slave [default=without]]), [with_iso=$withval], [with_iso=no] ) diff --git a/doc/en/credits.docbook b/doc/en/credits.docbook index 6cd627a..9c730ec 100644 --- a/doc/en/credits.docbook +++ b/doc/en/credits.docbook @@ -157,7 +157,7 @@ module for the 3rd Hand Panel - Szombathelyi György, ISO KIO + Szombathelyi György, ISO TDEIO slave diff --git a/doc/en/faq.docbook b/doc/en/faq.docbook index 55020d0..e78cda2 100644 --- a/doc/en/faq.docbook +++ b/doc/en/faq.docbook @@ -935,7 +935,7 @@ krarc.protocol file into $TDEDIR/share/services - or the directory where the KIO slaves are placed in + or the directory where the TDEIO slaves are placed in your &Linux; distribution. @@ -952,7 +952,7 @@ installed in the correct places in the &kde; directory tree. The tdeio_krarc.* files must be in the same - directory with the other KIO slaves. Try this: locate + directory with the other TDEIO slaves. Try this: locate tdeio_tar.* and copy/link the tdeio_krarc.* files to the same location. Don't forget to run diff --git a/doc/en/glossary.docbook b/doc/en/glossary.docbook index 5db6f96..5ae829c 100644 --- a/doc/en/glossary.docbook +++ b/doc/en/glossary.docbook @@ -186,9 +186,9 @@ viewer. - + - KIO or tdeioslave + TDEIO or tdeioslave KDE diff --git a/doc/en/index.docbook b/doc/en/index.docbook index b80be8f..731a911 100644 --- a/doc/en/index.docbook +++ b/doc/en/index.docbook @@ -174,7 +174,7 @@ http://groups.google.com/group/krusader-devel/browse_thread/thread/d102adec2edcf RPM Guide'> KIOSlaves'> KIOSlaves'> -KIOipod-slave'> +KIOipod-slave'> &kde;libs'> &kde;base'> GNOME'> diff --git a/doc/en/user-interface.docbook b/doc/en/user-interface.docbook index f002858..3c681a6 100644 --- a/doc/en/user-interface.docbook +++ b/doc/en/user-interface.docbook @@ -202,7 +202,7 @@ ipod:/ - uses the &kio-ipodslave-url; to + uses the &tdeio-ipodslave-url; to access, upload and organize the music stored on &appleipod;. diff --git a/doc/ru/credits.docbook b/doc/ru/credits.docbook index 649a53b..116e718 100644 --- a/doc/ru/credits.docbook +++ b/doc/ru/credits.docbook @@ -183,7 +183,7 @@ Szombathelyi György, ISO KIO slave +>Szombathelyi György, ISO TDEIO slave $TDEDIR/share/services или директорию , в которой находятся KIO slaves вашего дистрибутива &Linux;. +>или директорию , в которой находятся TDEIO slaves вашего дистрибутива &Linux;. @@ -933,7 +933,7 @@ Иконки, tdeio_slaves и документация должны быть правильно установлены в дереве каталогов &kde;. Файлы tdeio_krarc.* быть в той же директории , что и остальные KIO slaves.Попробуйте : locate быть в той же директории , что и остальные TDEIO slaves.Попробуйте : locate tdeio_tar.* и копируйте/сделайте ссылки на файлы tdeio_krarc.*/g' ${FILENAME}.pot - perl -p -i -e 's/tde-i18n-doc\@kde.org/krusader-i18n\@googlegroups.com/g' ${FILENAME}.pot + perl -p -i -e 's/kde-i18n-doc\@kde.org/krusader-i18n\@googlegroups.com/g' ${FILENAME}.pot done # move pot files to folder krusader_trinity/doc/i18n/pot since they don't belong in the english folder diff --git a/iso/Makefile.am b/iso/Makefile.am index b0a1c8f..83783d8 100644 --- a/iso/Makefile.am +++ b/iso/Makefile.am @@ -9,7 +9,7 @@ INCLUDES = $(all_includes) tdeio_iso_la_METASOURCES=AUTO tdeio_iso_la_SOURCES = kisodirectory.cpp kisofile.cpp qfilehack.cpp kiso.cpp iso.cpp -tdeio_iso_la_LIBADD = libisofs/libisofs.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KIO) +tdeio_iso_la_LIBADD = libisofs/libisofs.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) tdeio_iso_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) diff --git a/iso/libisofs/Makefile.am b/iso/libisofs/Makefile.am index a1278ff..f859581 100644 --- a/iso/libisofs/Makefile.am +++ b/iso/libisofs/Makefile.am @@ -9,7 +9,7 @@ INCLUDES = $(all_includes) libisofs_la_METASOURCES=AUTO libisofs_la_SOURCES = isofs.c -#libisofs_la_LIBADD = $(LIB_KIO) +#libisofs_la_LIBADD = $(LIB_TDEIO) #libisofs_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) diff --git a/krArc/Makefile.am b/krArc/Makefile.am index 9ac2db5..df0d0f4 100644 --- a/krArc/Makefile.am +++ b/krArc/Makefile.am @@ -10,7 +10,7 @@ INCLUDES = $(all_includes) tdeio_krarc_la_METASOURCES=AUTO tdeio_krarc_la_SOURCES = krarc.cpp -tdeio_krarc_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_KIO) +tdeio_krarc_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) # $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) tdeio_krarc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) diff --git a/krusader.kdevprj b/krusader.kdevprj index 1ca49b5..d10d7b5 100644 --- a/krusader.kdevprj +++ b/krusader.kdevprj @@ -22,7 +22,7 @@ bin_program=krusader cflags=-DKDE_NO_COMPAT -D_LARGEFILE64_SOURCE cppflags=-DKDE_NO_COMPAT -D_LARGEFILE64_SOURCE cxxflags=\s-O0 -Wall -ldadd=UserMenu/libUserMenu.a VFS/libVFS.a KViewer/libKViewer.a Dialogs/libDialogs.a BookMan/libBookMan.a GUI/libGUI.a $(LIB_KPARTS) $(LIB_TDEFILE) $(LIB_TDEHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) +ldadd=UserMenu/libUserMenu.a VFS/libVFS.a KViewer/libKViewer.a Dialogs/libDialogs.a BookMan/libBookMan.a GUI/libGUI.a $(LIB_TDEPARTS) $(LIB_TDEFILE) $(LIB_TDEHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) ldflags=\s \s [General] diff --git a/krusader.spec b/krusader.spec index b72f636..51a2d04 100644 --- a/krusader.spec +++ b/krusader.spec @@ -26,7 +26,7 @@ It provides all the file management features you could possibly want. Plus: extensive archive handling, mounted filesystem support, FTP, advanced search module, an internal viewer/editor, directory synchronisation, file content comparisons, powerful batch renaming and much much more. -It supports a wide variety of archive formats and can handle other KIO slaves +It supports a wide variety of archive formats and can handle other TDEIO slaves such as smb or fish. It is (almost) completely customizable, very user friendly, fast and looks great on your desktop! You should give it a try. diff --git a/krusader/BookMan/krbookmarkhandler.cpp b/krusader/BookMan/krbookmarkhandler.cpp index 573cb47..f9cafbe 100644 --- a/krusader/BookMan/krbookmarkhandler.cpp +++ b/krusader/BookMan/krbookmarkhandler.cpp @@ -143,7 +143,7 @@ void KrBookmarkHandler::exportToFileFolder(TQDomDocument &doc, TQDomElement &par // My own bookmarks // KOffice Web Site // -// KDevelop Web Site +// KDevelop Web Site // // // diff --git a/krusader/Makefile.am b/krusader/Makefile.am index cd37db8..a0ebd48 100644 --- a/krusader/Makefile.am +++ b/krusader/Makefile.am @@ -95,7 +95,7 @@ krusader_LDADD = \ GUI/libGUI.a \ $(LIB_KONQ) \ $(LIB_KJSEMBED) \ - $(LIB_KPARTS) \ + $(LIB_TDEPARTS) \ $(LIB_TDEFILE) \ $(LIB_TDEHTML) \ $(LIB_TDEUI) \ @@ -108,7 +108,7 @@ krusader_LDADD = \ # the library search path. -krusader_LDFLAGS = $(all_libraries) $(kde_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdewalletclient +krusader_LDFLAGS = $(all_libraries) $(kde_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdewalletclient ########################################################### diff --git a/krusader/Splitter/combiner.cpp b/krusader/Splitter/combiner.cpp index 6f738b3..2295483 100644 --- a/krusader/Splitter/combiner.cpp +++ b/krusader/Splitter/combiner.cpp @@ -243,7 +243,7 @@ void Combiner::combineDataReceived(TDEIO::Job *, const TQByteArray &byteArray) void Combiner::combineReceiveFinished(TDEIO::Job *job) { - combineReadJob = 0; /* KIO automatically deletes the object after Finished signal */ + combineReadJob = 0; /* TDEIO automatically deletes the object after Finished signal */ if( job->error() ) { @@ -288,7 +288,7 @@ void Combiner::combineDataSend(TDEIO::Job *, TQByteArray &byteArray) void Combiner::combineSendFinished(TDEIO::Job *job) { - combineWriteJob = 0; /* KIO automatically deletes the object after Finished signal */ + combineWriteJob = 0; /* TDEIO automatically deletes the object after Finished signal */ if( job->error() ) /* any error occurred? */ { diff --git a/krusader/Splitter/splitter.cpp b/krusader/Splitter/splitter.cpp index 03acc8c..00ef801 100644 --- a/krusader/Splitter/splitter.cpp +++ b/krusader/Splitter/splitter.cpp @@ -114,7 +114,7 @@ void Splitter::splitDataReceived(TDEIO::Job *, const TQByteArray &byteArray) void Splitter::splitReceiveFinished(TDEIO::Job *job) { - splitReadJob = 0; /* KIO automatically deletes the object after Finished signal */ + splitReadJob = 0; /* TDEIO automatically deletes the object after Finished signal */ if( splitWriteJob ) /* write out the end of the file */ splitWriteJob->resume(); @@ -193,7 +193,7 @@ void Splitter::splitDataSend(TDEIO::Job *, TQByteArray &byteArray) void Splitter::splitSendFinished(TDEIO::Job *job) { - splitWriteJob = 0; /* KIO automatically deletes the object after Finished signal */ + splitWriteJob = 0; /* TDEIO automatically deletes the object after Finished signal */ if( job->error() ) /* any error occurred? */ { @@ -237,7 +237,7 @@ void Splitter::splitFileSend(TDEIO::Job *, TQByteArray &byteArray) void Splitter::splitFileFinished(TDEIO::Job *job) { - splitWriteJob = 0; /* KIO automatically deletes the object after Finished signal */ + splitWriteJob = 0; /* TDEIO automatically deletes the object after Finished signal */ if( job->error() ) /* any error occurred? */ { diff --git a/krusader/VFS/krquery.h b/krusader/VFS/krquery.h index e422acc..5193107 100644 --- a/krusader/VFS/krquery.h +++ b/krusader/VFS/krquery.h @@ -57,7 +57,7 @@ public: // matching a file with the query bool match( vfile *file ) const;// checks if the given vfile object matches the conditions - // matching a KIO file with the query + // matching a TDEIO file with the query bool match( KFileItem *file ) const;// checks if the given vfile object matches the conditions // matching a name with the query bool match( const TQString &name ) const;// matching the filename only diff --git a/krusader/VFS/normal_vfs.cpp b/krusader/VFS/normal_vfs.cpp index d01d8d6..d9c1930 100644 --- a/krusader/VFS/normal_vfs.cpp +++ b/krusader/VFS/normal_vfs.cpp @@ -71,7 +71,7 @@ normal_vfs::normal_vfs(TQObject* panel):vfs(panel), watcher(0) { bool normal_vfs::populateVfsList(const KURL& origin, bool showHidden){ TQString path = origin.path(-1); - // set the writable attribute to true, if that's not the case - the KIO job + // set the writable attribute to true, if that's not the case - the TDEIO job // will give the warnings and errors isWritable = true; diff --git a/krusader/VFS/preservingcopyjob.cpp b/krusader/VFS/preservingcopyjob.cpp index 1ca4397..77a6bb0 100644 --- a/krusader/VFS/preservingcopyjob.cpp +++ b/krusader/VFS/preservingcopyjob.cpp @@ -155,7 +155,7 @@ void PreservingCopyJob::slotAboutToCreate( TDEIO::Job */*job*/, const TQValueLis void PreservingCopyJob::slotResult( Job *job ) { if( !job->error() ) { - if( job->inherits( "TDEIO::StatJob" ) ) { /* Unfortunately KIO forgets to set times when the file is in the */ + if( job->inherits( "TDEIO::StatJob" ) ) { /* Unfortunately TDEIO forgets to set times when the file is in the */ KURL url = ((TDEIO::SimpleJob *)job)->url(); /* base directory. That's why we capture every StatJob and set the */ /* time manually. */ TDEIO::UDSEntry entry = static_cast(job)->statResult(); diff --git a/krusader/main.cpp b/krusader/main.cpp index 00577bc..cecfe89 100644 --- a/krusader/main.cpp +++ b/krusader/main.cpp @@ -135,7 +135,7 @@ int main(int argc, char *argv[]) { aboutData.addCredit("Mark Eatough", "Handbook Proof-Reader", "markeatough@yahoo.com", 0); aboutData.addCredit("Jan Halasa", "The old Bookmark Module", "xhalasa@fi.muni.cz", 0); aboutData.addCredit("Hans Loeffler", "Dir history button", 0, 0); - aboutData.addCredit("Szombathelyi György", "ISO KIO slave", 0, 0); + aboutData.addCredit("Szombathelyi György", "ISO TDEIO slave", 0, 0); aboutData.addCredit("Jan Willem van de Meent (Adios)", "Icons for Krusader", "janwillem@lorentz.leidenuniv.nl", 0); aboutData.addCredit("Mikolaj Machowski", "Usability and QA", "", 0); aboutData.addCredit("Cristi Dumitrescu","QA, bug-hunting, patches and general help","cristid@chip.ro",0); diff --git a/tar/Makefile.am b/tar/Makefile.am index f4409ab..4d2ed23 100644 --- a/tar/Makefile.am +++ b/tar/Makefile.am @@ -1,19 +1,19 @@ ## Makefile.am of tdebase/tdeioslave/tar INCLUDES = $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor METASOURCES = AUTO kde_module_LTLIBRARIES = tdeio_tar.la tdeio_tar_la_SOURCES = tar.cc -tdeio_tar_la_LIBADD = $(LIB_KSYCOCA) +tdeio_tar_la_LIBADD = $(LIB_TDESYCOCA) tdeio_tar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) check_PROGRAMS = ktartest ktartest_SOURCES = ktartest.cpp -ktartest_LDADD = $(LIB_KSYCOCA) +ktartest_LDADD = $(LIB_TDESYCOCA) noinst_HEADERS = tar.h diff --git a/virt/Makefile.am b/virt/Makefile.am index 87eedad..c099846 100644 --- a/virt/Makefile.am +++ b/virt/Makefile.am @@ -1,13 +1,13 @@ ## Makefile.am of tdebase/tdeioslave/tar INCLUDES = $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor METASOURCES = AUTO kde_module_LTLIBRARIES = tdeio_virt.la tdeio_virt_la_SOURCES = virt.cc -tdeio_virt_la_LIBADD = $(LIB_KSYCOCA) +tdeio_virt_la_LIBADD = $(LIB_TDESYCOCA) tdeio_virt_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) noinst_HEADERS = virt.h -- cgit v1.2.1