summaryrefslogtreecommitdiffstats
path: root/ksystemlog/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:12:20 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:12:20 -0600
commitdbd03a35639ec4ea5ecbf580f9e84c224989531a (patch)
tree7f4c35d46663b2336a26d4a32ced2601a59b6f00 /ksystemlog/src
parentaf170e7e3fc1491de418039e06d5a8bd12ea352a (diff)
downloadksystemlog-dbd03a35639ec4ea5ecbf580f9e84c224989531a.tar.gz
ksystemlog-dbd03a35639ec4ea5ecbf580f9e84c224989531a.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'ksystemlog/src')
-rw-r--r--ksystemlog/src/Makefile.am2
-rw-r--r--ksystemlog/src/view.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/ksystemlog/src/Makefile.am b/ksystemlog/src/Makefile.am
index c0588e3..c0bbdc3 100644
--- a/ksystemlog/src/Makefile.am
+++ b/ksystemlog/src/Makefile.am
@@ -14,7 +14,7 @@ INCLUDES = -I$(top_srcdir)/ksystemlog/src -I$(top_builddir)/ksystemlog/src/
-I$(top_srcdir)/ksystemlog/src/system -I$(top_srcdir)/ksystemlog/src/xorg $(all_includes)
# the library search path.
-ksystemlog_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lkutils
+ksystemlog_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdeutils
# the libraries to link against.
ksystemlog_LDADD = \
diff --git a/ksystemlog/src/view.h b/ksystemlog/src/view.h
index 82da7e8..50cd8af 100644
--- a/ksystemlog/src/view.h
+++ b/ksystemlog/src/view.h
@@ -42,7 +42,7 @@
#include <kconfig.h>
#include <ksystemlogiface.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
#include "globals.h"
#include "logListItem.h"