summaryrefslogtreecommitdiffstats
path: root/ksysguard/gui
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:16:20 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:16:20 -0600
commitdc6b76cac424bdf8b3cffb4ae82f3954d8acdba5 (patch)
tree4ebcd3dac0133d8d3fa880bbf83692c305b7350d /ksysguard/gui
parent1a9478c6e1b77b05814af8fa02cd563a5da8946b (diff)
downloadtdebase-dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5.tar.gz
tdebase-dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'ksysguard/gui')
-rw-r--r--ksysguard/gui/CMakeLists.txt2
-rw-r--r--ksysguard/gui/Makefile.am2
2 files changed, 2 insertions, 2 deletions
diff --git a/ksysguard/gui/CMakeLists.txt b/ksysguard/gui/CMakeLists.txt
index e6d7357bf..7313b6b5d 100644
--- a/ksysguard/gui/CMakeLists.txt
+++ b/ksysguard/gui/CMakeLists.txt
@@ -51,7 +51,7 @@ tde_add_executable( ksysguard AUTOMOC
SOURCES
SensorBrowser.cc WorkSheet.cc WorkSheetSettings.cc
Workspace.cc ksysguard.cc ksysguard.skel
- LINK sensordisplays-static ksgrd-shared kdnssd-shared
+ LINK sensordisplays-static ksgrd-shared tdednssd-shared
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/ksysguard/gui/Makefile.am b/ksysguard/gui/Makefile.am
index 4479b1c38..3d849af15 100644
--- a/ksysguard/gui/Makefile.am
+++ b/ksysguard/gui/Makefile.am
@@ -32,7 +32,7 @@ ksysguard_LDADD = \
ksgrd/libksgrd.la \
SensorDisplayLib/libsensordisplays.la \
$(LIB_TDEUI) $(LIB_KIO) $(LIB_KDNSSD)
-ksysguard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+ksysguard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kpm_SOURCES = kpm.c