diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-09-03 20:02:55 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-09-03 21:02:00 +0200 |
| commit | 533bad2a1503973aaf8186691422c2eda91d02d4 (patch) | |
| tree | f7e52f62416048859aa9bde8425e20aac0e7c669 /tderesources/scalix/tdeabc | |
| parent | 8144d5434bbd1c4448a37695aed6ad3d348043d8 (diff) | |
| download | tdepim-533bad2a1503973aaf8186691422c2eda91d02d4.tar.gz tdepim-533bad2a1503973aaf8186691422c2eda91d02d4.zip | |
Additional k => tde renaming and fixes
Diffstat (limited to 'tderesources/scalix/tdeabc')
| -rw-r--r-- | tderesources/scalix/tdeabc/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | tderesources/scalix/tdeabc/Makefile.am | 10 | ||||
| -rw-r--r-- | tderesources/scalix/tdeabc/resourcescalix.h | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/tderesources/scalix/tdeabc/CMakeLists.txt b/tderesources/scalix/tdeabc/CMakeLists.txt index bfdaa3478..5875d5ac7 100644 --- a/tderesources/scalix/tdeabc/CMakeLists.txt +++ b/tderesources/scalix/tdeabc/CMakeLists.txt @@ -38,14 +38,14 @@ install( tde_add_kpart( tdeabc_scalix AUTOMOC SOURCES resourcescalix_plugin.cpp - LINK kabcscalix-shared + LINK tdeabcscalix-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) -##### kabcscalix (shared) ####################### +##### tdeabcscalix (shared) ####################### -tde_add_library( kabcscalix SHARED AUTOMOC +tde_add_library( tdeabcscalix SHARED AUTOMOC SOURCES resourcescalix.cpp contact.cpp VERSION 0.0.0 LINK resourcescalixshared-static kgroupwarebase-shared diff --git a/tderesources/scalix/tdeabc/Makefile.am b/tderesources/scalix/tdeabc/Makefile.am index 88cf96d14..79577d8dd 100644 --- a/tderesources/scalix/tdeabc/Makefile.am +++ b/tderesources/scalix/tdeabc/Makefile.am @@ -3,11 +3,11 @@ METASOURCES = AUTO INCLUDES = -I$(top_srcdir)/tderesources/scalix/shared -I$(top_srcdir) $(all_includes) # The scalix wizard links to this library too -lib_LTLIBRARIES = libkabcscalix.la +lib_LTLIBRARIES = libtdeabcscalix.la -libkabcscalix_la_SOURCES = resourcescalix.cpp contact.cpp -libkabcscalix_la_LDFLAGS = $(all_libraries) -no-undefined -libkabcscalix_la_LIBADD = \ +libtdeabcscalix_la_SOURCES = resourcescalix.cpp contact.cpp +libtdeabcscalix_la_LDFLAGS = $(all_libraries) -no-undefined +libtdeabcscalix_la_LIBADD = \ $(top_builddir)/tderesources/scalix/shared/libresourcescalixshared.la \ -ltderesources -ltdeabc @@ -17,7 +17,7 @@ noinst_HEADERS = resourcescalix.h tdeabc_scalix_la_SOURCES = resourcescalix_plugin.cpp tdeabc_scalix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined -tdeabc_scalix_la_LIBADD = libkabcscalix.la +tdeabc_scalix_la_LIBADD = libtdeabcscalix.la servicedir = $(kde_servicesdir)/tderesources/tdeabc service_DATA = scalix.desktop diff --git a/tderesources/scalix/tdeabc/resourcescalix.h b/tderesources/scalix/tdeabc/resourcescalix.h index 0fa58cdff..f9d4c3092 100644 --- a/tderesources/scalix/tdeabc/resourcescalix.h +++ b/tderesources/scalix/tdeabc/resourcescalix.h @@ -157,7 +157,7 @@ protected: TQ_UINT32 sernum, const KMailICalIface::StorageFormat format ); TQString configFile() const { - return Scalix::ResourceScalixBase::configFile( "kabc" ); + return Scalix::ResourceScalixBase::configFile( "tdeabc" ); } // The list of subresources |