From 48087e1d5650499b6093a6816356d467c8461802 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:17:46 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- krfb/kcm_krfb/CMakeLists.txt | 2 +- krfb/kcm_krfb/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'krfb/kcm_krfb') diff --git a/krfb/kcm_krfb/CMakeLists.txt b/krfb/kcm_krfb/CMakeLists.txt index 4edb8d82..4f7e0b95 100644 --- a/krfb/kcm_krfb/CMakeLists.txt +++ b/krfb/kcm_krfb/CMakeLists.txt @@ -30,6 +30,6 @@ install( FILES kcmkrfb.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) tde_add_kpart( kcm_krfb AUTOMOC SOURCES configurationwidget.ui kcm_krfb.cpp - LINK krfbconfig-static srvloc-static kdnssd-shared kio-shared + LINK krfbconfig-static srvloc-static tdednssd-shared kio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/krfb/kcm_krfb/Makefile.am b/krfb/kcm_krfb/Makefile.am index b8f90547..a077da21 100644 --- a/krfb/kcm_krfb/Makefile.am +++ b/krfb/kcm_krfb/Makefile.am @@ -4,7 +4,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = kcm_krfb.la kcm_krfb_la_SOURCES = configurationwidget.ui kcm_krfb.cpp -kcm_krfb_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kcm_krfb_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kcm_krfb_la_LIBADD = ../krfb/libkrfbconfig.la $(LIB_TDEUI) -lkio # Services -- cgit v1.2.1