summaryrefslogtreecommitdiffstats
path: root/yakuake
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:14:07 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:14:07 -0600
commit28898b25d5583c19acc32e3d3feb668a2d548944 (patch)
tree2a49b9dde9146a6a049c412a1e7248903b6fb5d4 /yakuake
parent715ba2979474688104ea0cd81e847f547e2214d2 (diff)
downloadyakuake-28898b25d5583c19acc32e3d3feb668a2d548944.tar.gz
yakuake-28898b25d5583c19acc32e3d3feb668a2d548944.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'yakuake')
-rw-r--r--yakuake/src/Makefile.am2
-rw-r--r--yakuake/src/terminal.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/yakuake/src/Makefile.am b/yakuake/src/Makefile.am
index 91ff46a..e7dc5ce 100644
--- a/yakuake/src/Makefile.am
+++ b/yakuake/src/Makefile.am
@@ -11,7 +11,7 @@ yakuake_SOURCES = dcop_interface.skel first_run_dialog.cpp \
tabbed_widget.cpp tab_bar.cpp terminal.cpp terminal_focus_watcher.cpp \
terminal_splitter.cpp title_bar.cpp translucent_widget.cpp
-yakuake_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+yakuake_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
yakuake_LDADD = $(LIB_TDEUI) $(LIB_KIO)
INCLUDES = -I$(top_srcdir)/. -I$(top_srcdir)/src $(all_includes)
diff --git a/yakuake/src/terminal.h b/yakuake/src/terminal.h
index db3ce26..9c4115e 100644
--- a/yakuake/src/terminal.h
+++ b/yakuake/src/terminal.h
@@ -21,7 +21,7 @@
#include <tqwidget.h>
#include <klibloader.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
#include <kde_terminal_interface.h>