diff options
| author | Timothy Pearson <[email protected]> | 2013-01-26 13:10:41 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-26 13:10:41 -0600 |
| commit | 7422cac1a18dca897d3830a267eb91683d05a95b (patch) | |
| tree | 2ba309f49b47a5fbb0b226801b224c2532b7ab1a /chalk/plugins/tools/defaulttools | |
| parent | 3fe437def8063926892bddf2dcc733861308836d (diff) | |
| download | koffice-7422cac1a18dca897d3830a267eb91683d05a95b.tar.gz koffice-7422cac1a18dca897d3830a267eb91683d05a95b.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'chalk/plugins/tools/defaulttools')
| -rw-r--r-- | chalk/plugins/tools/defaulttools/Makefile.am | 2 | ||||
| -rw-r--r-- | chalk/plugins/tools/defaulttools/default_tools.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chalk/plugins/tools/defaulttools/Makefile.am b/chalk/plugins/tools/defaulttools/Makefile.am index 329e9bb7..95358bcf 100644 --- a/chalk/plugins/tools/defaulttools/Makefile.am +++ b/chalk/plugins/tools/defaulttools/Makefile.am @@ -44,7 +44,7 @@ noinst_HEADERS = \ kis_tool_pan.h -chalkdefaulttools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkdefaulttools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkdefaulttools_la_LIBADD = ../../../libchalkcommon.la $(LIB_KOPAINTER) $(LIB_KOFFICECORE) \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/tools/defaulttools/default_tools.h b/chalk/plugins/tools/defaulttools/default_tools.h index fc5b72c6..dbf60d93 100644 --- a/chalk/plugins/tools/defaulttools/default_tools.h +++ b/chalk/plugins/tools/defaulttools/default_tools.h @@ -19,7 +19,7 @@ #ifndef DEFAULT_TOOLS_H_ #define DEFAULT_TOOLS_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> /** * A module wrapper around Chalk's default tools. |