diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:50 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:50 -0600 |
| commit | b363d2579af0a11b77e698aed2e1021c2233b644 (patch) | |
| tree | f4a47b87354b7a6a3b266c8121bd8ddaeb7accaa /kontact/plugins/knotes | |
| parent | 61bddfe3a7226b18c68a76124b727c736f431688 (diff) | |
| download | tdepim-b363d2579af0a11b77e698aed2e1021c2233b644.tar.gz tdepim-b363d2579af0a11b77e698aed2e1021c2233b644.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kontact/plugins/knotes')
| -rw-r--r-- | kontact/plugins/knotes/Makefile.am | 2 | ||||
| -rw-r--r-- | kontact/plugins/knotes/knotes_part.h | 2 |
2 files changed, 2 insertions, 2 deletions
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 <kiconloader.h> #include <libkcal/journal.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include "knotes/KNotesIface.h" |