summaryrefslogtreecommitdiffstats
path: root/tderesources/groupwise
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/groupwise
parent10251f9a2a51f37c2a42833c1d05cd5a8fdf6bb5 (diff)
downloadtdepim-513d0163e99d4447deb274b9f0799bb390f26cfc.tar.gz
tdepim-513d0163e99d4447deb274b9f0799bb390f26cfc.zip
Fix FTBFS
Diffstat (limited to 'tderesources/groupwise')
-rw-r--r--tderesources/groupwise/CMakeLists.txt18
-rw-r--r--tderesources/groupwise/Makefile.am24
-rw-r--r--tderesources/groupwise/tdeabc_groupwise.desktop2
-rw-r--r--tderesources/groupwise/tdeabc_resourcegroupwise.cpp6
-rw-r--r--tderesources/groupwise/tdeabc_resourcegroupwise_plugin.cpp6
-rw-r--r--tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp8
6 files changed, 32 insertions, 32 deletions
diff --git a/tderesources/groupwise/CMakeLists.txt b/tderesources/groupwise/CMakeLists.txt
index f13a96f6f..5efc61539 100644
--- a/tderesources/groupwise/CMakeLists.txt
+++ b/tderesources/groupwise/CMakeLists.txt
@@ -29,7 +29,7 @@ link_directories(
##### other data ################################
install( FILES kcal_groupwise.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal )
-install( FILES kabc_groupwise.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc )
+install( FILES tdeabc_groupwise.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc )
##### kcal_groupwise (module) ###################
@@ -41,11 +41,11 @@ tde_add_kpart( kcal_groupwise AUTOMOC
)
-##### kabc_groupwise (module) ###################
+##### tdeabc_groupwise (module) ###################
-tde_add_kpart( kabc_groupwise AUTOMOC
- SOURCES kabc_resourcegroupwise_plugin.cpp
- LINK kabc_groupwise-shared
+tde_add_kpart( tdeabc_groupwise AUTOMOC
+ SOURCES tdeabc_resourcegroupwise_plugin.cpp
+ LINK tdeabc_groupwise-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
@@ -63,12 +63,12 @@ tde_add_library( kcal_groupwise SHARED AUTOMOC
)
-##### kabc_groupwise (shared) ###################
+##### tdeabc_groupwise (shared) ###################
-tde_add_library( kabc_groupwise SHARED AUTOMOC
+tde_add_library( tdeabc_groupwise SHARED AUTOMOC
SOURCES
- kabc_resourcegroupwise.cpp kabc_resourcegroupwiseconfig.cpp
- kabc_groupwiseprefs.kcfgc
+ tdeabc_resourcegroupwise.cpp tdeabc_resourcegroupwiseconfig.cpp
+ tdeabc_groupwiseprefs.kcfgc
VERSION 1.0.0
LINK gwsoap-shared
DESTINATION ${LIB_INSTALL_DIR}
diff --git a/tderesources/groupwise/Makefile.am b/tderesources/groupwise/Makefile.am
index 14c1320ce..c098935db 100644
--- a/tderesources/groupwise/Makefile.am
+++ b/tderesources/groupwise/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = soap tdeioslave
INCLUDES = -I$(top_srcdir) $(all_includes)
-lib_LTLIBRARIES = libkcal_groupwise.la libkabc_groupwise.la
+lib_LTLIBRARIES = libkcal_groupwise.la libtdeabc_groupwise.la
libkcal_groupwise_la_SOURCES = kcal_resourcegroupwise.cpp \
kcal_resourcegroupwiseconfig.cpp kcal_groupwiseprefsbase.kcfgc kcal_groupwiseprefs.cpp \
@@ -13,32 +13,32 @@ libkcal_groupwise_la_LIBADD = soap/libgwsoap.la \
$(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/libtdepim/libtdepim.la
-libkabc_groupwise_la_SOURCES = kabc_resourcegroupwise.cpp \
- kabc_resourcegroupwiseconfig.cpp \
- kabc_groupwiseprefs.kcfgc
-libkabc_groupwise_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \
+libtdeabc_groupwise_la_SOURCES = tdeabc_resourcegroupwise.cpp \
+ tdeabc_resourcegroupwiseconfig.cpp \
+ tdeabc_groupwiseprefs.kcfgc
+libtdeabc_groupwise_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \
-version-info 1:0:0 -no-undefined
-libkabc_groupwise_la_LIBADD = soap/libgwsoap.la \
+libtdeabc_groupwise_la_LIBADD = soap/libgwsoap.la \
$(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/libtdepim/libtdepim.la \
-lkabc
-kde_module_LTLIBRARIES = kcal_groupwise.la kabc_groupwise.la
+kde_module_LTLIBRARIES = kcal_groupwise.la tdeabc_groupwise.la
kcal_groupwise_la_SOURCES = kcal_resourcegroupwise_plugin.cpp
kcal_groupwise_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
kcal_groupwise_la_LIBADD = libkcal_groupwise.la
-kabc_groupwise_la_SOURCES = kabc_resourcegroupwise_plugin.cpp
-kabc_groupwise_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kabc_groupwise_la_LIBADD = libkabc_groupwise.la
+tdeabc_groupwise_la_SOURCES = tdeabc_resourcegroupwise_plugin.cpp
+tdeabc_groupwise_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeabc_groupwise_la_LIBADD = libtdeabc_groupwise.la
kcal_servicedir = $(kde_servicesdir)/tderesources/kcal
kcal_service_DATA = kcal_groupwise.desktop
-kabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc
-kabc_service_DATA = kabc_groupwise.desktop
+tdeabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc
+tdeabc_service_DATA = tdeabc_groupwise.desktop
METASOURCES = AUTO
diff --git a/tderesources/groupwise/tdeabc_groupwise.desktop b/tderesources/groupwise/tdeabc_groupwise.desktop
index 695ab445b..262bb53df 100644
--- a/tderesources/groupwise/tdeabc_groupwise.desktop
+++ b/tderesources/groupwise/tdeabc_groupwise.desktop
@@ -43,7 +43,7 @@ Name[tr]=Novell GroupWise Sunucusu
Name[uk]=Сервер Novell GroupWise
Name[zh_CN]=Novell GroupWise 服务器
Name[zh_TW]=Novell 群組伺服器
-X-TDE-Library=kabc_groupwise
+X-TDE-Library=tdeabc_groupwise
Type=Service
ServiceTypes=KResources/Plugin
X-TDE-ResourceFamily=contact
diff --git a/tderesources/groupwise/tdeabc_resourcegroupwise.cpp b/tderesources/groupwise/tdeabc_resourcegroupwise.cpp
index 8499aa9ff..1c29fc65b 100644
--- a/tderesources/groupwise/tdeabc_resourcegroupwise.cpp
+++ b/tderesources/groupwise/tdeabc_resourcegroupwise.cpp
@@ -27,9 +27,9 @@
#include <kdebug.h>
#include <tdelocale.h>
-#include "kabc_groupwiseprefs.h"
+#include "tdeabc_groupwiseprefs.h"
-#include "kabc_resourcegroupwise.h"
+#include "tdeabc_resourcegroupwise.h"
using namespace KABC;
@@ -740,4 +740,4 @@ bool ResourceGroupwise::appIsWhiteListedForSAB()
return true;
}
-#include "kabc_resourcegroupwise.moc"
+#include "tdeabc_resourcegroupwise.moc"
diff --git a/tderesources/groupwise/tdeabc_resourcegroupwise_plugin.cpp b/tderesources/groupwise/tdeabc_resourcegroupwise_plugin.cpp
index b3a94a901..29d94d4f5 100644
--- a/tderesources/groupwise/tdeabc_resourcegroupwise_plugin.cpp
+++ b/tderesources/groupwise/tdeabc_resourcegroupwise_plugin.cpp
@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include "kabc_resourcegroupwise.h"
-#include "kabc_resourcegroupwiseconfig.h"
+#include "tdeabc_resourcegroupwise.h"
+#include "tdeabc_resourcegroupwiseconfig.h"
#include <tdeglobal.h>
#include <tdelocale.h>
@@ -27,7 +27,7 @@
using namespace KABC;
typedef KRES::PluginFactory<ResourceGroupwise, ResourceGroupwiseConfig> GroupwiseFactory;
-// FIXME: Use K_EXPORT_COMPONENT_FACTORY( kabc_groupwise, GroupwiseFactory ); here
+// FIXME: Use K_EXPORT_COMPONENT_FACTORY( tdeabc_groupwise, GroupwiseFactory ); here
// Problem: How do I insert the catalogue???
extern "C"
{
diff --git a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp
index 1212a6bc5..fdb219b77 100644
--- a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp
+++ b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp
@@ -18,10 +18,10 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include "kabc_resourcegroupwiseconfig.h"
+#include "tdeabc_resourcegroupwiseconfig.h"
-#include "kabc_resourcegroupwise.h"
-#include "kabc_groupwiseprefs.h"
+#include "tdeabc_resourcegroupwise.h"
+#include "tdeabc_groupwiseprefs.h"
#include <kcombobox.h>
#include <kdebug.h>
@@ -206,4 +206,4 @@ void ResourceGroupwiseConfig::updateAddressBookView()
mAddressBookBox->setCurrentItem( index );
}
-#include "kabc_resourcegroupwiseconfig.moc"
+#include "tdeabc_resourcegroupwiseconfig.moc"