diff options
| author | Timothy Pearson <[email protected]> | 2013-01-26 13:16:20 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-26 13:16:20 -0600 |
| commit | dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5 (patch) | |
| tree | 4ebcd3dac0133d8d3fa880bbf83692c305b7350d /kioslave/man | |
| parent | 1a9478c6e1b77b05814af8fa02cd563a5da8946b (diff) | |
| download | tdebase-dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5.tar.gz tdebase-dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kioslave/man')
| -rw-r--r-- | kioslave/man/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kioslave/man/Makefile.am | 8 | ||||
| -rw-r--r-- | kioslave/man/kmanpart.h | 8 |
3 files changed, 9 insertions, 9 deletions
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> |