From b363d2579af0a11b77e698aed2e1021c2233b644 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:17:50 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- libtdepim/komposer/core/Makefile.am | 2 +- libtdepim/komposer/core/pluginmanager.cpp | 2 +- libtdepim/komposer/core/tests/Makefile.am | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'libtdepim/komposer/core') diff --git a/libtdepim/komposer/core/Makefile.am b/libtdepim/komposer/core/Makefile.am index 2898c0774..764ec052b 100644 --- a/libtdepim/komposer/core/Makefile.am +++ b/libtdepim/komposer/core/Makefile.am @@ -6,7 +6,7 @@ lib_LTLIBRARIES = libkomposer.la libkomposer_la_SOURCES = plugin.cpp editor.cpp core.cpp attachment.cpp corewidget.cpp \ settings.kcfgc pluginmanager.cpp komposerIface.skel libkomposer_la_LDFLAGS = -no-undefined $(KDE_RPATH) -version-info 1:0:0 $(all_libraries) -libkomposer_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/libtdepim/libtdepim.la -lkutils +libkomposer_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/libtdepim/libtdepim.la -ltdeutils #kde_module_LTLIBRARIES = kcm_komposer.la diff --git a/libtdepim/komposer/core/pluginmanager.cpp b/libtdepim/komposer/core/pluginmanager.cpp index b19ead449..f2778178a 100644 --- a/libtdepim/komposer/core/pluginmanager.cpp +++ b/libtdepim/komposer/core/pluginmanager.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include #include diff --git a/libtdepim/komposer/core/tests/Makefile.am b/libtdepim/komposer/core/tests/Makefile.am index 4958c55ed..829fb3097 100644 --- a/libtdepim/komposer/core/tests/Makefile.am +++ b/libtdepim/komposer/core/tests/Makefile.am @@ -5,15 +5,15 @@ check_PROGRAMS = testfactory testmanager testkomposer METASOURCES = AUTO testfactory_SOURCES = main.cpp managertest.cpp -testfactory_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testfactory_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor testfactory_LDADD = ../libkomposer.la testmanager_SOURCES = testmanager.cpp -testmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor testmanager_LDADD = ../libkomposer.la testkomposer_SOURCES = testkomposer.cpp -testkomposer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testkomposer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor testkomposer_LDADD = ../libkomposer.la check: testfactory -- cgit v1.2.1