summaryrefslogtreecommitdiffstats
path: root/tderesources/groupdav
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-17 02:31:04 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-17 02:31:40 -0600
commit513d0163e99d4447deb274b9f0799bb390f26cfc (patch)
tree7686847bc46ef657e8d278a4a342e21d0a1edb80 /tderesources/groupdav
parent10251f9a2a51f37c2a42833c1d05cd5a8fdf6bb5 (diff)
downloadtdepim-513d0163e99d4447deb274b9f0799bb390f26cfc.tar.gz
tdepim-513d0163e99d4447deb274b9f0799bb390f26cfc.zip
Fix FTBFS
Diffstat (limited to 'tderesources/groupdav')
-rw-r--r--tderesources/groupdav/CMakeLists.txt18
-rw-r--r--tderesources/groupdav/Makefile.am22
-rw-r--r--tderesources/groupdav/tdeabc_groupdav.desktop2
-rw-r--r--tderesources/groupdav/tdeabc_resourcegroupdav.cpp4
-rw-r--r--tderesources/groupdav/tdeabc_resourcegroupdav.h2
-rw-r--r--tderesources/groupdav/tdeabc_resourcegroupdav_plugin.cpp6
6 files changed, 27 insertions, 27 deletions
diff --git a/tderesources/groupdav/CMakeLists.txt b/tderesources/groupdav/CMakeLists.txt
index f85244b34..13e314b9b 100644
--- a/tderesources/groupdav/CMakeLists.txt
+++ b/tderesources/groupdav/CMakeLists.txt
@@ -28,8 +28,8 @@ link_directories(
install( FILES kcal_groupdav.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal )
install( FILES uninstall.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal RENAME kcal_opengroupware.desktop )
-install( FILES kabc_groupdav.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc )
-install( FILES uninstall.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc RENAME kabc_opengroupware.desktop)
+install( FILES tdeabc_groupdav.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc )
+install( FILES uninstall.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc RENAME tdeabc_opengroupware.desktop)
##### kcal_groupdav (module) ####################
@@ -41,11 +41,11 @@ tde_add_kpart( kcal_groupdav AUTOMOC
)
-##### kabc_groupdav (module) ####################
+##### tdeabc_groupdav (module) ####################
-tde_add_kpart( kabc_groupdav AUTOMOC
- SOURCES kabc_resourcegroupdav_plugin.cpp
- LINK kabc_groupdav-shared
+tde_add_kpart( tdeabc_groupdav AUTOMOC
+ SOURCES tdeabc_resourcegroupdav_plugin.cpp
+ LINK tdeabc_groupdav-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
@@ -67,10 +67,10 @@ tde_add_library( kcal_groupdav SHARED AUTOMOC
)
-##### kabc_groupdav (shared) ####################
+##### tdeabc_groupdav (shared) ####################
-tde_add_library( kabc_groupdav SHARED AUTOMOC
- SOURCES kabc_resourcegroupdav.cpp groupdavaddressbookadaptor.cpp
+tde_add_library( tdeabc_groupdav SHARED AUTOMOC
+ SOURCES tdeabc_resourcegroupdav.cpp groupdavaddressbookadaptor.cpp
VERSION 1.0.0
LINK kgroupdav-static kgroupwaredav-shared
DESTINATION ${LIB_INSTALL_DIR}
diff --git a/tderesources/groupdav/Makefile.am b/tderesources/groupdav/Makefile.am
index 3b04b2fbd..1511e4f66 100644
--- a/tderesources/groupdav/Makefile.am
+++ b/tderesources/groupdav/Makefile.am
@@ -1,7 +1,7 @@
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tderesources/lib \
-I../lib $(all_includes)
-lib_LTLIBRARIES = libkcal_groupdav.la libkabc_groupdav.la
+lib_LTLIBRARIES = libkcal_groupdav.la libtdeabc_groupdav.la
noinst_LTLIBRARIES = libkgroupdav.la
libkgroupdav_la_SOURCES = groupdavglobals.cpp
@@ -13,29 +13,29 @@ libkcal_groupdav_la_LIBADD = \
libkgroupdav.la ../lib/libkgroupwaredav.la \
$(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la
-libkabc_groupdav_la_SOURCES = kabc_resourcegroupdav.cpp groupdavaddressbookadaptor.cpp
-libkabc_groupdav_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \
+libtdeabc_groupdav_la_SOURCES = tdeabc_resourcegroupdav.cpp groupdavaddressbookadaptor.cpp
+libtdeabc_groupdav_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \
-version-info 1:0:0 -no-undefined
-libkabc_groupdav_la_LIBADD = \
+libtdeabc_groupdav_la_LIBADD = \
libkgroupdav.la ../lib/libkgroupwaredav.la \
$(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la \
-lkabc
-kde_module_LTLIBRARIES = kcal_groupdav.la kabc_groupdav.la
+kde_module_LTLIBRARIES = kcal_groupdav.la tdeabc_groupdav.la
kcal_groupdav_la_SOURCES = kcal_resourcegroupdav_plugin.cpp
kcal_groupdav_la_LDFLAGS = $(all_libraries) -module -no-undefined $(KDE_PLUGIN)
kcal_groupdav_la_LIBADD = libkcal_groupdav.la
-kabc_groupdav_la_SOURCES = kabc_resourcegroupdav_plugin.cpp
-kabc_groupdav_la_LDFLAGS = $(all_libraries) -module -no-undefined $(KDE_PLUGIN)
-kabc_groupdav_la_LIBADD = libkabc_groupdav.la
+tdeabc_groupdav_la_SOURCES = tdeabc_resourcegroupdav_plugin.cpp
+tdeabc_groupdav_la_LDFLAGS = $(all_libraries) -module -no-undefined $(KDE_PLUGIN)
+tdeabc_groupdav_la_LIBADD = libtdeabc_groupdav.la
kcal_servicedir = $(kde_servicesdir)/tderesources/kcal
kcal_service_DATA = kcal_groupdav.desktop
-kabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc
-kabc_service_DATA = kabc_groupdav.desktop
+tdeabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc
+tdeabc_service_DATA = tdeabc_groupdav.desktop
METASOURCES = AUTO
@@ -48,5 +48,5 @@ install-data-local: uninstall.desktop
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kres_groupdav.pot
-kabc_resourcegroupdav.lo: ../lib/tderesources_groupwareprefs.h
+tdeabc_resourcegroupdav.lo: ../lib/tderesources_groupwareprefs.h
diff --git a/tderesources/groupdav/tdeabc_groupdav.desktop b/tderesources/groupdav/tdeabc_groupdav.desktop
index c10ea97c2..d08edf5ea 100644
--- a/tderesources/groupdav/tdeabc_groupdav.desktop
+++ b/tderesources/groupdav/tdeabc_groupdav.desktop
@@ -45,7 +45,7 @@ Name[tr]=GroupDAV Sunucusu (ör. OpenGroupware)
Name[uk]=Сервер GroupDAV (напр., OpenGroupware)
Name[zh_CN]=GroupDAV 服务器(如 OpenGroupware)
Name[zh_TW]=GroupDAV 伺服器 (如: OpenGroupware)
-X-TDE-Library=kabc_groupdav
+X-TDE-Library=tdeabc_groupdav
Type=Service
ServiceTypes=KResources/Plugin
X-TDE-ResourceFamily=contact
diff --git a/tderesources/groupdav/tdeabc_resourcegroupdav.cpp b/tderesources/groupdav/tdeabc_resourcegroupdav.cpp
index 1f50e04bb..e74b4d2c8 100644
--- a/tderesources/groupdav/tdeabc_resourcegroupdav.cpp
+++ b/tderesources/groupdav/tdeabc_resourcegroupdav.cpp
@@ -23,7 +23,7 @@
#include "groupdavaddressbookadaptor.h"
#include "tderesources_groupwareprefs.h"
-#include "kabc_resourcegroupdav.h"
+#include "tdeabc_resourcegroupdav.h"
using namespace KABC;
@@ -44,4 +44,4 @@ void ResourceGroupDav::init()
ResourceGroupwareBase::init();
}
-#include "kabc_resourcegroupdav.moc"
+#include "tdeabc_resourcegroupdav.moc"
diff --git a/tderesources/groupdav/tdeabc_resourcegroupdav.h b/tderesources/groupdav/tdeabc_resourcegroupdav.h
index ca7ed96d3..51f40856f 100644
--- a/tderesources/groupdav/tdeabc_resourcegroupdav.h
+++ b/tderesources/groupdav/tdeabc_resourcegroupdav.h
@@ -22,7 +22,7 @@
#ifndef KABC_RESOURCEGROUPDAV_H
#define KABC_RESOURCEGROUPDAV_H
-#include "kabc_resourcegroupwarebase.h"
+#include "tdeabc_resourcegroupwarebase.h"
#include <tdepimmacros.h>
namespace KABC {
diff --git a/tderesources/groupdav/tdeabc_resourcegroupdav_plugin.cpp b/tderesources/groupdav/tdeabc_resourcegroupdav_plugin.cpp
index 1ef588dfd..b877231d7 100644
--- a/tderesources/groupdav/tdeabc_resourcegroupdav_plugin.cpp
+++ b/tderesources/groupdav/tdeabc_resourcegroupdav_plugin.cpp
@@ -20,8 +20,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include "kabc_resourcegroupdav.h"
-#include "kabc_resourcegroupwarebaseconfig.h"
+#include "tdeabc_resourcegroupdav.h"
+#include "tdeabc_resourcegroupwarebaseconfig.h"
#include <tdeglobal.h>
#include <tdelocale.h>
@@ -29,7 +29,7 @@
using namespace KABC;
typedef KRES::PluginFactory< ResourceGroupDav, ResourceGroupwareBaseConfig > GroupDavFactory;
-// FIXME: Use K_EXPORT_COMPONENT_FACTORY( kabc_groupdav, GroupDavFactory ); here
+// FIXME: Use K_EXPORT_COMPONENT_FACTORY( tdeabc_groupdav, GroupDavFactory ); here
// Problem: How do I insert the catalogue???
extern "C"
{