diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:21 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:21 -0600 |
| commit | dfe289850f068f19ba4a83ab4e7e22a7e09c13c9 (patch) | |
| tree | c297348a55df66c571de4525646e0b9762427353 /kabc/plugins/dir | |
| parent | b7658a0d5eca24a9d37c6e04f88298ef02389db0 (diff) | |
| download | tdelibs-dfe289850f068f19ba4a83ab4e7e22a7e09c13c9.tar.gz tdelibs-dfe289850f068f19ba4a83ab4e7e22a7e09c13c9.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kabc/plugins/dir')
| -rw-r--r-- | kabc/plugins/dir/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kabc/plugins/dir/Makefile.am | 4 | ||||
| -rw-r--r-- | kabc/plugins/dir/resourcedirconfig.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/kabc/plugins/dir/CMakeLists.txt b/kabc/plugins/dir/CMakeLists.txt index 1bc7d8daf..47f81a355 100644 --- a/kabc/plugins/dir/CMakeLists.txt +++ b/kabc/plugins/dir/CMakeLists.txt @@ -39,7 +39,7 @@ install( FILES ##### other data ################################ -install( FILES dir.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc ) +install( FILES dir.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc ) ##### kabc_dir (library) ######################## diff --git a/kabc/plugins/dir/Makefile.am b/kabc/plugins/dir/Makefile.am index f5c0c2523..52cd161e4 100644 --- a/kabc/plugins/dir/Makefile.am +++ b/kabc/plugins/dir/Makefile.am @@ -6,7 +6,7 @@ noinst_HEADERS = resourcedirconfig.h lib_LTLIBRARIES = libkabc_dir.la libkabc_dir_la_SOURCES = resourcedir.cpp resourcedirconfig.cpp libkabc_dir_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined -libkabc_dir_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI) +libkabc_dir_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI) libkabc_dir_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h kde_module_LTLIBRARIES = kabc_dir.la @@ -22,7 +22,7 @@ messages: rc.cpp kabcincludedir = $(includedir)/kabc kabcinclude_HEADERS = resourcedir.h -servicedir = $(kde_servicesdir)/kresources/kabc +servicedir = $(kde_servicesdir)/tderesources/kabc service_DATA = dir.desktop resourcedirplugin.lo: ../../addressee.h diff --git a/kabc/plugins/dir/resourcedirconfig.h b/kabc/plugins/dir/resourcedirconfig.h index 4333fdae1..9df1778d3 100644 --- a/kabc/plugins/dir/resourcedirconfig.h +++ b/kabc/plugins/dir/resourcedirconfig.h @@ -24,7 +24,7 @@ #include <kcombobox.h> #include <kurlrequester.h> -#include <kresources/configwidget.h> +#include <tderesources/configwidget.h> namespace KABC { |