diff options
Diffstat (limited to 'kioslave')
-rw-r--r-- | kioslave/about/Makefile.am | 2 | ||||
-rw-r--r-- | kioslave/finger/Makefile.am | 2 | ||||
-rw-r--r-- | kioslave/fish/Makefile.am | 2 | ||||
-rw-r--r-- | kioslave/mac/Makefile.am | 2 | ||||
-rw-r--r-- | kioslave/man/CMakeLists.txt | 2 | ||||
-rw-r--r-- | kioslave/man/Makefile.am | 8 | ||||
-rw-r--r-- | kioslave/man/kmanpart.h | 8 | ||||
-rw-r--r-- | kioslave/media/mounthelper/Makefile.am | 2 | ||||
-rw-r--r-- | kioslave/nfs/Makefile.am | 2 | ||||
-rw-r--r-- | kioslave/sftp/Makefile.am | 2 | ||||
-rw-r--r-- | kioslave/tar/Makefile.am | 2 | ||||
-rw-r--r-- | kioslave/thumbnail/CMakeLists.txt | 2 | ||||
-rw-r--r-- | kioslave/thumbnail/Makefile.am | 2 | ||||
-rw-r--r-- | kioslave/thumbnail/htmlcreator.cpp | 2 | ||||
-rw-r--r-- | kioslave/trash/Makefile.am | 2 |
15 files changed, 21 insertions, 21 deletions
diff --git a/kioslave/about/Makefile.am b/kioslave/about/Makefile.am index 900596fa3..df887e150 100644 --- a/kioslave/about/Makefile.am +++ b/kioslave/about/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am of tdebase/kioslave/about INCLUDES= $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor ####### Files diff --git a/kioslave/finger/Makefile.am b/kioslave/finger/Makefile.am index 2baac8d65..55066bf74 100644 --- a/kioslave/finger/Makefile.am +++ b/kioslave/finger/Makefile.am @@ -2,7 +2,7 @@ ## Edit from Makefile.am of tdebase/kioslave/man INCLUDES= $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor ####### Files diff --git a/kioslave/fish/Makefile.am b/kioslave/fish/Makefile.am index 8a7028f5d..bf7169bcf 100644 --- a/kioslave/fish/Makefile.am +++ b/kioslave/fish/Makefile.am @@ -1,7 +1,7 @@ kde_module_LTLIBRARIES = kio_fish.la INCLUDES = $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kio_fish_la_SOURCES = fish.cpp kio_fish_la_LIBADD = $(LIB_KSYCOCA) $(LIBUTIL) diff --git a/kioslave/mac/Makefile.am b/kioslave/mac/Makefile.am index d294975b0..37c94589e 100644 --- a/kioslave/mac/Makefile.am +++ b/kioslave/mac/Makefile.am @@ -1,7 +1,7 @@ ## Makfile.am for kio_mac INCLUDES= $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor ####### Files diff --git a/kioslave/man/CMakeLists.txt b/kioslave/man/CMakeLists.txt index 6532f0cbf..09434d131 100644 --- a/kioslave/man/CMakeLists.txt +++ b/kioslave/man/CMakeLists.txt @@ -55,6 +55,6 @@ set( target libkmanpart ) tde_add_kpart( ${target} AUTOMOC SOURCES kmanpart.cpp - LINK khtml-shared kparts-shared + LINK tdehtml-shared tdeparts-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kioslave/man/Makefile.am b/kioslave/man/Makefile.am index 1904c24a6..80d9ffa96 100644 --- a/kioslave/man/Makefile.am +++ b/kioslave/man/Makefile.am @@ -1,14 +1,14 @@ ## Makefile.am of tdebase/kioslave/man INCLUDES= $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor EXTRA_PROGRAMS = kio_man_test man2html ####### just for testing ([email protected], 15.02.2001) kio_man_test_SOURCES = kio_man_test.cpp -kio_man_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kio_man_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kio_man_test_LDADD = man2html.lo kio_man.lo $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) ####### Files @@ -22,7 +22,7 @@ noinst_HEADERS = kio_man.h ### TODO Why is man2htmk.h distributed? libkmanpart_la_SOURCES = kmanpart.cpp -libkmanpart_la_LIBADD = -lkhtml $(LIB_KPARTS) +libkmanpart_la_LIBADD = -ltdehtml $(LIB_KPARTS) libkmanpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) kdelnk_DATA = man.protocol kmanpart.desktop @@ -39,7 +39,7 @@ messages: man2html_SOURCES = dummy.cpp man2html_LDADD = man2html_simple.o $(LIB_QT) -man2html_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +man2html_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor dummy.cpp: echo > $@ diff --git a/kioslave/man/kmanpart.h b/kioslave/man/kmanpart.h index dd290cf75..971a48550 100644 --- a/kioslave/man/kmanpart.h +++ b/kioslave/man/kmanpart.h @@ -21,10 +21,10 @@ #ifndef KMANPART_H #define KMANPART_H -#include <kparts/factory.h> -#include <kparts/part.h> -#include <kparts/browserextension.h> -#include <khtml_part.h> +#include <tdeparts/factory.h> +#include <tdeparts/part.h> +#include <tdeparts/browserextension.h> +#include <tdehtml_part.h> #include <kio/job.h> #include <kio/jobclasses.h> diff --git a/kioslave/media/mounthelper/Makefile.am b/kioslave/media/mounthelper/Makefile.am index d3fb942bb..934559d40 100644 --- a/kioslave/media/mounthelper/Makefile.am +++ b/kioslave/media/mounthelper/Makefile.am @@ -5,7 +5,7 @@ AM_LDFLAGS = $(all_libraries) kio_media_mounthelper_SOURCES = kio_media_mounthelper.cpp decryptdialog.ui dialog.cpp -kio_media_mounthelper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kio_media_mounthelper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) $(LIB_TDEUI) METASOURCES = AUTO diff --git a/kioslave/nfs/Makefile.am b/kioslave/nfs/Makefile.am index 5dc730d7d..6dcb5ed3e 100644 --- a/kioslave/nfs/Makefile.am +++ b/kioslave/nfs/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am of tdebase/kioslave/man INCLUDES= $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor ####### Files diff --git a/kioslave/sftp/Makefile.am b/kioslave/sftp/Makefile.am index c59c1c210..abbb91323 100644 --- a/kioslave/sftp/Makefile.am +++ b/kioslave/sftp/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am of tdebase/kioslave/sftp INCLUDES = $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor METASOURCES = AUTO ####### Files diff --git a/kioslave/tar/Makefile.am b/kioslave/tar/Makefile.am index d1f3cdf05..d77b2abf9 100644 --- a/kioslave/tar/Makefile.am +++ b/kioslave/tar/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am of tdebase/kioslave/tar INCLUDES = $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor METASOURCES = AUTO kde_module_LTLIBRARIES = kio_tar.la diff --git a/kioslave/thumbnail/CMakeLists.txt b/kioslave/thumbnail/CMakeLists.txt index eb50589ab..9000b3494 100644 --- a/kioslave/thumbnail/CMakeLists.txt +++ b/kioslave/thumbnail/CMakeLists.txt @@ -85,7 +85,7 @@ set( target htmlthumbnail ) tde_add_kpart( ${target} AUTOMOC SOURCES htmlcreator.cpp - LINK khtml-shared + LINK tdehtml-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kioslave/thumbnail/Makefile.am b/kioslave/thumbnail/Makefile.am index 5a63c88bb..ecd2e492b 100644 --- a/kioslave/thumbnail/Makefile.am +++ b/kioslave/thumbnail/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am of tdebase/kioslave/thumbnail INCLUDES = $(all_includes) $(EXR_FLAGS) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor METASOURCES = AUTO if have_xcursor diff --git a/kioslave/thumbnail/htmlcreator.cpp b/kioslave/thumbnail/htmlcreator.cpp index 43aec5f39..a928e4253 100644 --- a/kioslave/thumbnail/htmlcreator.cpp +++ b/kioslave/thumbnail/htmlcreator.cpp @@ -23,7 +23,7 @@ #include <tqimage.h> #include <tqpainter.h> #include <kapplication.h> -#include <khtml_part.h> +#include <tdehtml_part.h> #include "htmlcreator.h" diff --git a/kioslave/trash/Makefile.am b/kioslave/trash/Makefile.am index a3f24ed92..94b7ab519 100644 --- a/kioslave/trash/Makefile.am +++ b/kioslave/trash/Makefile.am @@ -12,7 +12,7 @@ kio_trash_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined bin_PROGRAMS = ktrash ktrash_SOURCES = ktrash.cpp ktrash_LDADD = $(LIB_KIO) -ktrash_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +ktrash_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kde_services_DATA = trash.protocol |