From 513d0163e99d4447deb274b9f0799bb390f26cfc Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 17 Feb 2013 02:31:04 -0600
Subject: Fix FTBFS

---
 tderesources/scalix/kabc/CMakeLists.txt            | 4 ++--
 tderesources/scalix/kabc/Makefile.am               | 8 ++++----
 tderesources/scalix/kabc/resourcescalix.cpp        | 2 +-
 tderesources/scalix/kabc/resourcescalix_plugin.cpp | 2 +-
 tderesources/scalix/kabc/scalix.desktop            | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'tderesources/scalix')

diff --git a/tderesources/scalix/kabc/CMakeLists.txt b/tderesources/scalix/kabc/CMakeLists.txt
index 3aed963d7..bfdaa3478 100644
--- a/tderesources/scalix/kabc/CMakeLists.txt
+++ b/tderesources/scalix/kabc/CMakeLists.txt
@@ -34,9 +34,9 @@ install(
   DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc )
 
 
-##### kabc_scalix (module) ######################
+##### tdeabc_scalix (module) ######################
 
-tde_add_kpart( kabc_scalix AUTOMOC
+tde_add_kpart( tdeabc_scalix AUTOMOC
   SOURCES resourcescalix_plugin.cpp
   LINK kabcscalix-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/tderesources/scalix/kabc/Makefile.am b/tderesources/scalix/kabc/Makefile.am
index 21e3ba17d..e8bbc3bbc 100644
--- a/tderesources/scalix/kabc/Makefile.am
+++ b/tderesources/scalix/kabc/Makefile.am
@@ -11,13 +11,13 @@ libkabcscalix_la_LIBADD =  \
 	$(top_builddir)/tderesources/scalix/shared/libresourcescalixshared.la \
 	-ltderesources -lkabc
 
-kde_module_LTLIBRARIES = kabc_scalix.la
+kde_module_LTLIBRARIES = tdeabc_scalix.la
 
 noinst_HEADERS = resourcescalix.h
 
-kabc_scalix_la_SOURCES = resourcescalix_plugin.cpp
-kabc_scalix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
-kabc_scalix_la_LIBADD = libkabcscalix.la
+tdeabc_scalix_la_SOURCES = resourcescalix_plugin.cpp
+tdeabc_scalix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
+tdeabc_scalix_la_LIBADD = libkabcscalix.la
 
 servicedir = $(kde_servicesdir)/tderesources/tdeabc
 service_DATA = scalix.desktop
diff --git a/tderesources/scalix/kabc/resourcescalix.cpp b/tderesources/scalix/kabc/resourcescalix.cpp
index d7826e17c..ea3928a59 100644
--- a/tderesources/scalix/kabc/resourcescalix.cpp
+++ b/tderesources/scalix/kabc/resourcescalix.cpp
@@ -70,7 +70,7 @@ class ScalixFactory : public KRES::PluginFactoryBase
     }
 };
 
-K_EXPORT_COMPONENT_FACTORY(kabc_scalix,ScalixFactory)
+K_EXPORT_COMPONENT_FACTORY(tdeabc_scalix,ScalixFactory)
 
 static const char* s_kmailContentsType = "Contact";
 static const char* s_attachmentMimeTypeContact = "application/x-vnd.kolab.contact";
diff --git a/tderesources/scalix/kabc/resourcescalix_plugin.cpp b/tderesources/scalix/kabc/resourcescalix_plugin.cpp
index bbf7a436a..cdfc8f301 100644
--- a/tderesources/scalix/kabc/resourcescalix_plugin.cpp
+++ b/tderesources/scalix/kabc/resourcescalix_plugin.cpp
@@ -49,5 +49,5 @@ class ScalixFactory : public KRES::PluginFactoryBase
     }
 };
 
-K_EXPORT_COMPONENT_FACTORY(kabc_scalix,ScalixFactory)
+K_EXPORT_COMPONENT_FACTORY(tdeabc_scalix,ScalixFactory)
 
diff --git a/tderesources/scalix/kabc/scalix.desktop b/tderesources/scalix/kabc/scalix.desktop
index 3f483dff6..cc2a8c464 100644
--- a/tderesources/scalix/kabc/scalix.desktop
+++ b/tderesources/scalix/kabc/scalix.desktop
@@ -23,7 +23,7 @@ Name[sv]=Adressbok på Scalix-server via Kmail
 Name[tr]=KMail Aracılığı ile Scalix Sunucusunda Adres Defteri
 Name[zh_CN]=通过 KMail 访问 Scalix 服务器上的地址簿
 Name[zh_TW]=透過 KMail 取得 Scalix 伺服器上的通訊錄
-X-TDE-Library=kabc_scalix
+X-TDE-Library=tdeabc_scalix
 Type=Service
 ServiceTypes=KResources/Plugin
 X-TDE-ResourceFamily=contact
-- 
cgit v1.2.1