diff options
Diffstat (limited to 'kabc/plugins')
-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 | ||||
-rw-r--r-- | kabc/plugins/evolution/Makefile.am | 2 | ||||
-rw-r--r-- | kabc/plugins/file/CMakeLists.txt | 2 | ||||
-rw-r--r-- | kabc/plugins/file/Makefile.am | 4 | ||||
-rw-r--r-- | kabc/plugins/file/resourcefileconfig.h | 2 | ||||
-rw-r--r-- | kabc/plugins/ldapkio/CMakeLists.txt | 2 | ||||
-rw-r--r-- | kabc/plugins/ldapkio/Makefile.am | 4 | ||||
-rw-r--r-- | kabc/plugins/ldapkio/resourceldapkioconfig.h | 2 | ||||
-rw-r--r-- | kabc/plugins/net/CMakeLists.txt | 2 | ||||
-rw-r--r-- | kabc/plugins/net/Makefile.am | 2 | ||||
-rw-r--r-- | kabc/plugins/net/resourcenetconfig.h | 2 | ||||
-rw-r--r-- | kabc/plugins/sql/Makefile.am | 2 |
14 files changed, 17 insertions, 17 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 { diff --git a/kabc/plugins/evolution/Makefile.am b/kabc/plugins/evolution/Makefile.am index 5967b9433..fd7b9be3b 100644 --- a/kabc/plugins/evolution/Makefile.am +++ b/kabc/plugins/evolution/Makefile.am @@ -15,5 +15,5 @@ METASOURCES = AUTO messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kabc_evolution.pot -servicedir = $(kde_servicesdir)/kresources/kabc +servicedir = $(kde_servicesdir)/tderesources/kabc service_DATA = evolution.desktop diff --git a/kabc/plugins/file/CMakeLists.txt b/kabc/plugins/file/CMakeLists.txt index 0c767b00d..3dbcd639f 100644 --- a/kabc/plugins/file/CMakeLists.txt +++ b/kabc/plugins/file/CMakeLists.txt @@ -39,7 +39,7 @@ install( FILES ##### other data ################################ -install( FILES file.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc ) +install( FILES file.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc ) ##### kabc_file (library) ####################### diff --git a/kabc/plugins/file/Makefile.am b/kabc/plugins/file/Makefile.am index 3060bfab5..832ec2283 100644 --- a/kabc/plugins/file/Makefile.am +++ b/kabc/plugins/file/Makefile.am @@ -6,7 +6,7 @@ noinst_HEADERS = resourcefileconfig.h lib_LTLIBRARIES = libkabc_file.la libkabc_file_la_SOURCES = resourcefile.cpp resourcefileconfig.cpp libkabc_file_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined -libkabc_file_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_KFILE) $(LIB_TDECORE) $(LIB_TDEUI) +libkabc_file_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_KFILE) $(LIB_TDECORE) $(LIB_TDEUI) libkabc_file_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h @@ -24,5 +24,5 @@ messages: rc.cpp kabcincludedir = $(includedir)/kabc kabcinclude_HEADERS = resourcefile.h -servicedir = $(kde_servicesdir)/kresources/kabc +servicedir = $(kde_servicesdir)/tderesources/kabc service_DATA = file.desktop diff --git a/kabc/plugins/file/resourcefileconfig.h b/kabc/plugins/file/resourcefileconfig.h index 343a5623d..18c217eda 100644 --- a/kabc/plugins/file/resourcefileconfig.h +++ b/kabc/plugins/file/resourcefileconfig.h @@ -24,7 +24,7 @@ #include <kcombobox.h> #include <kurlrequester.h> -#include <kresources/configwidget.h> +#include <tderesources/configwidget.h> namespace KABC { diff --git a/kabc/plugins/ldapkio/CMakeLists.txt b/kabc/plugins/ldapkio/CMakeLists.txt index 57370c9cf..150377bd9 100644 --- a/kabc/plugins/ldapkio/CMakeLists.txt +++ b/kabc/plugins/ldapkio/CMakeLists.txt @@ -39,7 +39,7 @@ install( FILES ##### other data ################################ -install( FILES ldapkio.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc ) +install( FILES ldapkio.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc ) ##### kabc_ldapkio ############################## diff --git a/kabc/plugins/ldapkio/Makefile.am b/kabc/plugins/ldapkio/Makefile.am index 97cd9089c..a9803f650 100644 --- a/kabc/plugins/ldapkio/Makefile.am +++ b/kabc/plugins/ldapkio/Makefile.am @@ -6,7 +6,7 @@ noinst_HEADERS = resourceldapkioconfig.h lib_LTLIBRARIES = libkabc_ldapkio.la libkabc_ldapkio_la_SOURCES = resourceldapkio.cpp resourceldapkioconfig.cpp libkabc_ldapkio_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined -libkabc_ldapkio_la_LIBADD = $(LIB_KABC) $(LIB_KIO) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_TDEUI) $(LIB_TDECORE) +libkabc_ldapkio_la_LIBADD = $(LIB_KABC) $(LIB_KIO) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEUI) $(LIB_TDECORE) libkabc_ldapkio_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h kde_module_LTLIBRARIES = kabc_ldapkio.la @@ -22,7 +22,7 @@ messages: rc.cpp kabcincludedir = $(includedir)/kabc kabcinclude_HEADERS = resourceldapkio.h -servicedir = $(kde_servicesdir)/kresources/kabc +servicedir = $(kde_servicesdir)/tderesources/kabc service_DATA = ldapkio.desktop resourceldapkioplugin.lo: ../../addressee.h diff --git a/kabc/plugins/ldapkio/resourceldapkioconfig.h b/kabc/plugins/ldapkio/resourceldapkioconfig.h index e14c7c428..0fde41d64 100644 --- a/kabc/plugins/ldapkio/resourceldapkioconfig.h +++ b/kabc/plugins/ldapkio/resourceldapkioconfig.h @@ -27,7 +27,7 @@ #include <tqdict.h> #include <kdialogbase.h> -#include <kresources/configwidget.h> +#include <tderesources/configwidget.h> #include <kabc/ldif.h> #include <kabc/ldapconfigwidget.h> diff --git a/kabc/plugins/net/CMakeLists.txt b/kabc/plugins/net/CMakeLists.txt index 5433af217..365922d6c 100644 --- a/kabc/plugins/net/CMakeLists.txt +++ b/kabc/plugins/net/CMakeLists.txt @@ -39,7 +39,7 @@ install( FILES ##### other data ################################ -install( FILES net.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc ) +install( FILES net.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc ) ##### kabc_net (library) ######################## diff --git a/kabc/plugins/net/Makefile.am b/kabc/plugins/net/Makefile.am index f4183d442..ca0ece015 100644 --- a/kabc/plugins/net/Makefile.am +++ b/kabc/plugins/net/Makefile.am @@ -22,7 +22,7 @@ messages: rc.cpp kabcincludedir = $(includedir)/kabc kabcinclude_HEADERS = resourcenet.h -servicedir = $(kde_servicesdir)/kresources/kabc +servicedir = $(kde_servicesdir)/tderesources/kabc service_DATA = net.desktop resourcenetplugin.lo: ../../addressee.h diff --git a/kabc/plugins/net/resourcenetconfig.h b/kabc/plugins/net/resourcenetconfig.h index e07937739..3c8986122 100644 --- a/kabc/plugins/net/resourcenetconfig.h +++ b/kabc/plugins/net/resourcenetconfig.h @@ -24,7 +24,7 @@ #include <kcombobox.h> #include <kurlrequester.h> -#include <kresources/configwidget.h> +#include <tderesources/configwidget.h> namespace KABC { diff --git a/kabc/plugins/sql/Makefile.am b/kabc/plugins/sql/Makefile.am index 6d638936f..3fa3986ce 100644 --- a/kabc/plugins/sql/Makefile.am +++ b/kabc/plugins/sql/Makefile.am @@ -15,6 +15,6 @@ METASOURCES = AUTO messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kabc_sql.pot -linkdir = $(kde_datadir)/kresources/contact +linkdir = $(kde_datadir)/tderesources/contact link_DATA = sql.desktop EXTRA_DIST = $(link_DATA) |