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 --- kopete/plugins/smpppdcs/unittest/Makefile.am | 6 +++--- kopete/plugins/smpppdcs/unittest/clienttest.h | 2 +- kopete/plugins/smpppdcs/unittest/main.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'kopete/plugins/smpppdcs') diff --git a/kopete/plugins/smpppdcs/unittest/Makefile.am b/kopete/plugins/smpppdcs/unittest/Makefile.am index 093f425d..3fc4fcee 100644 --- a/kopete/plugins/smpppdcs/unittest/Makefile.am +++ b/kopete/plugins/smpppdcs/unittest/Makefile.am @@ -5,11 +5,11 @@ METASOURCES = AUTO check_PROGRAMS = smpppdcstests smpppdcstests_SOURCES = main.cpp clienttest.cpp -smpppdcstests_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -smpppdcstests_LDADD = ../libsmpppdclient/libsmpppdclient.la -lkunittestgui +smpppdcstests_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +smpppdcstests_LDADD = ../libsmpppdclient/libsmpppdclient.la -ltdeunittestgui noinst_HEADERS = clienttest.h check: - kunittest ./smpppdcstests ClientTest + tdeunittest ./smpppdcstests ClientTest diff --git a/kopete/plugins/smpppdcs/unittest/clienttest.h b/kopete/plugins/smpppdcs/unittest/clienttest.h index 2892d572..2d46aebf 100644 --- a/kopete/plugins/smpppdcs/unittest/clienttest.h +++ b/kopete/plugins/smpppdcs/unittest/clienttest.h @@ -17,7 +17,7 @@ #ifndef CLIENTTEST_H #define CLIENTTEST_H -#include +#include /** @author Heiko Schäfer diff --git a/kopete/plugins/smpppdcs/unittest/main.cpp b/kopete/plugins/smpppdcs/unittest/main.cpp index 41153444..5eda8cb2 100644 --- a/kopete/plugins/smpppdcs/unittest/main.cpp +++ b/kopete/plugins/smpppdcs/unittest/main.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include "clienttest.h" -- cgit v1.2.1