From c8d2c86fa91a88915c64665a57de1e9a88c67da2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:15:06 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- kttsd/filters/Makefile.am | 2 +- kttsd/filters/main.cpp | 2 +- kttsd/filters/sbd/sbdconf.cpp | 2 +- kttsd/filters/stringreplacer/stringreplacerconf.cpp | 2 +- kttsd/filters/talkerchooser/talkerchooserconf.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'kttsd/filters') diff --git a/kttsd/filters/Makefile.am b/kttsd/filters/Makefile.am index 9c95218..2db77e5 100644 --- a/kttsd/filters/Makefile.am +++ b/kttsd/filters/Makefile.am @@ -17,7 +17,7 @@ check_PROGRAMS = testfilter testfilter_SOURCES = main.cpp -testfilter_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testfilter_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor testfilter_LDADD = \ $(top_builddir)/kttsd/libkttsd/libkttsd.la \ $(LIB_TDECORE) diff --git a/kttsd/filters/main.cpp b/kttsd/filters/main.cpp index 983b68b..755fa68 100644 --- a/kttsd/filters/main.cpp +++ b/kttsd/filters/main.cpp @@ -34,7 +34,7 @@ using namespace std; #include #include #include -#include +#include #include "filterproc.h" #include "talkercode.h" diff --git a/kttsd/filters/sbd/sbdconf.cpp b/kttsd/filters/sbd/sbdconf.cpp index 4fe3c9d..5720549 100644 --- a/kttsd/filters/sbd/sbdconf.cpp +++ b/kttsd/filters/sbd/sbdconf.cpp @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include // KTTS includes. diff --git a/kttsd/filters/stringreplacer/stringreplacerconf.cpp b/kttsd/filters/stringreplacer/stringreplacerconf.cpp index 6a96307..a0de6d9 100644 --- a/kttsd/filters/stringreplacer/stringreplacerconf.cpp +++ b/kttsd/filters/stringreplacer/stringreplacerconf.cpp @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include diff --git a/kttsd/filters/talkerchooser/talkerchooserconf.cpp b/kttsd/filters/talkerchooser/talkerchooserconf.cpp index ce5e00f..1a78ab3 100644 --- a/kttsd/filters/talkerchooser/talkerchooserconf.cpp +++ b/kttsd/filters/talkerchooser/talkerchooserconf.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include // KTTS includes. -- cgit v1.2.1