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 --- kontact/plugins/knotes/Makefile.am | 2 +- kontact/plugins/knotes/knotes_part.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'kontact/plugins/knotes') diff --git a/kontact/plugins/knotes/Makefile.am b/kontact/plugins/knotes/Makefile.am index 84e219b7c..2b2dc9ed0 100644 --- a/kontact/plugins/knotes/Makefile.am +++ b/kontact/plugins/knotes/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libkontact_knotesplugin.la libkontact_knotesplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) libkontact_knotesplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la \ $(LIB_KPARTS) $(top_builddir)/libtdepim/libtdepim.la \ - $(top_builddir)/libkcal/libkcal.la -lkresources -ltdeprint \ + $(top_builddir)/libkcal/libkcal.la -ltderesources -ltdeprint \ $(top_builddir)/knotes/libknotesresources.la \ $(top_builddir)/knotes/libknoteseditor.la \ $(top_builddir)/knotes/libknotesprinting.la diff --git a/kontact/plugins/knotes/knotes_part.h b/kontact/plugins/knotes/knotes_part.h index a3c7c790e..b83c677f3 100644 --- a/kontact/plugins/knotes/knotes_part.h +++ b/kontact/plugins/knotes/knotes_part.h @@ -29,7 +29,7 @@ #include #include -#include +#include #include "knotes/KNotesIface.h" -- cgit v1.2.1