diff options
| author | Timothy Pearson <[email protected]> | 2013-01-26 13:17:46 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-26 13:17:46 -0600 |
| commit | 48087e1d5650499b6093a6816356d467c8461802 (patch) | |
| tree | 00c39f978492596620df1374e8a91af507d8bac3 /kopete/plugins/netmeeting | |
| parent | ccfaeb9b831a41e93e777b041cdf33a7d40a0e0b (diff) | |
| download | tdenetwork-48087e1d5650499b6093a6816356d467c8461802.tar.gz tdenetwork-48087e1d5650499b6093a6816356d467c8461802.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kopete/plugins/netmeeting')
| -rw-r--r-- | kopete/plugins/netmeeting/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kopete/plugins/netmeeting/Makefile.am | 4 | ||||
| -rw-r--r-- | kopete/plugins/netmeeting/netmeetingpreferences.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/kopete/plugins/netmeeting/CMakeLists.txt b/kopete/plugins/netmeeting/CMakeLists.txt index 318b6724..a53e1ff2 100644 --- a/kopete/plugins/netmeeting/CMakeLists.txt +++ b/kopete/plugins/netmeeting/CMakeLists.txt @@ -51,6 +51,6 @@ tde_add_kpart( kopete_netmeeting AUTOMOC tde_add_kpart( kcm_kopete_netmeeting AUTOMOC SOURCES netmeetingprefs_ui.ui netmeetingpreferences.cpp - LINK kutils-shared + LINK tdeutils-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kopete/plugins/netmeeting/Makefile.am b/kopete/plugins/netmeeting/Makefile.am index 7e9f4088..1710f136 100644 --- a/kopete/plugins/netmeeting/Makefile.am +++ b/kopete/plugins/netmeeting/Makefile.am @@ -5,7 +5,7 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/protocols/msn $(all_incl kde_module_LTLIBRARIES = kopete_netmeeting.la kcm_kopete_netmeeting.la kopete_netmeeting_la_SOURCES = netmeetingplugin.cpp netmeetinginvitation.cpp netmeetingguiclient.cpp -kopete_netmeeting_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kopete_netmeeting_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kopete_netmeeting_la_LIBADD = $(top_builddir)/kopete/libkopete/libkopete.la $(top_builddir)/kopete/protocols/msn/libkopete_msn_shared.la service_DATA = kopete_netmeeting.desktop @@ -15,7 +15,7 @@ mydatadir = $(kde_datadir)/kopete_netmeeting mydata_DATA = netmeetingchatui.rc kcm_kopete_netmeeting_la_SOURCES = netmeetingprefs_ui.ui netmeetingpreferences.cpp -kcm_kopete_netmeeting_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kcm_kopete_netmeeting_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kcm_kopete_netmeeting_la_LIBADD = $(LIB_KOPETECOMPAT) $(LIB_KUTILS) diff --git a/kopete/plugins/netmeeting/netmeetingpreferences.cpp b/kopete/plugins/netmeeting/netmeetingpreferences.cpp index d5d7f01b..9981351d 100644 --- a/kopete/plugins/netmeeting/netmeetingpreferences.cpp +++ b/kopete/plugins/netmeeting/netmeetingpreferences.cpp @@ -19,7 +19,7 @@ #include <kcombobox.h> #include <klineedit.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <klocale.h> #include <kconfig.h> #include <kglobal.h> |