summaryrefslogtreecommitdiffstats
path: root/tderesources/groupware
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/groupware
parent10251f9a2a51f37c2a42833c1d05cd5a8fdf6bb5 (diff)
downloadtdepim-513d0163e99d4447deb274b9f0799bb390f26cfc.tar.gz
tdepim-513d0163e99d4447deb274b9f0799bb390f26cfc.zip
Fix FTBFS
Diffstat (limited to 'tderesources/groupware')
-rw-r--r--tderesources/groupware/Makefile.am24
-rw-r--r--tderesources/groupware/tdeabc_groupware.desktop2
-rw-r--r--tderesources/groupware/tdeabc_resourcegroupware.cpp6
-rw-r--r--tderesources/groupware/tdeabc_resourcegroupware_plugin.cpp4
-rw-r--r--tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp8
5 files changed, 22 insertions, 22 deletions
diff --git a/tderesources/groupware/Makefile.am b/tderesources/groupware/Makefile.am
index 35138a0db..38f5083dc 100644
--- a/tderesources/groupware/Makefile.am
+++ b/tderesources/groupware/Makefile.am
@@ -1,6 +1,6 @@
INCLUDES = -I$(top_srcdir) $(all_includes)
-lib_LTLIBRARIES = libkcal_groupware.la libkabc_groupware.la
+lib_LTLIBRARIES = libkcal_groupware.la libtdeabc_groupware.la
libkcal_groupware_la_SOURCES = kcal_resourcegroupware.cpp \
kcal_resourcegroupwareconfig.cpp \
@@ -11,30 +11,30 @@ libkcal_groupware_la_LIBADD = \
$(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/libtdepim/libtdepim.la
-libkabc_groupware_la_SOURCES = kabc_resourcegroupware.cpp \
- kabc_resourcegroupwareconfig.cpp \
- kabc_groupwareprefs.kcfgc
-libkabc_groupware_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \
+libtdeabc_groupware_la_SOURCES = tdeabc_resourcegroupware.cpp \
+ tdeabc_resourcegroupwareconfig.cpp \
+ tdeabc_groupwareprefs.kcfgc
+libtdeabc_groupware_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \
-version-info 1:0:0 -no-undefined
-libkabc_groupware_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
+libtdeabc_groupware_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/libtdepim/libtdepim.la \
-lkabc
-kde_module_LTLIBRARIES = kcal_groupware.la kabc_groupware.la
+kde_module_LTLIBRARIES = kcal_groupware.la tdeabc_groupware.la
kcal_groupware_la_SOURCES = kcal_resourcegroupware_plugin.cpp
kcal_groupware_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
kcal_groupware_la_LIBADD = libkcal_groupware.la
-kabc_groupware_la_SOURCES = kabc_resourcegroupware_plugin.cpp
-kabc_groupware_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kabc_groupware_la_LIBADD = libkabc_groupware.la
+tdeabc_groupware_la_SOURCES = tdeabc_resourcegroupware_plugin.cpp
+tdeabc_groupware_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeabc_groupware_la_LIBADD = libtdeabc_groupware.la
kcal_servicedir = $(kde_servicesdir)/tderesources/kcal
kcal_service_DATA = kcal_groupware.desktop
-kabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc
-kabc_service_DATA = kabc_groupware.desktop
+tdeabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc
+tdeabc_service_DATA = tdeabc_groupware.desktop
METASOURCES = AUTO
diff --git a/tderesources/groupware/tdeabc_groupware.desktop b/tderesources/groupware/tdeabc_groupware.desktop
index dee5d9c24..2e81da8fb 100644
--- a/tderesources/groupware/tdeabc_groupware.desktop
+++ b/tderesources/groupware/tdeabc_groupware.desktop
@@ -42,7 +42,7 @@ Name[tr]=Grupyazılımı(Groupware) Sunucusu
Name[uk]=Сервер Groupware
Name[zh_CN]=群件服务器
Name[zh_TW]=群組伺服器
-X-TDE-Library=kabc_groupware
+X-TDE-Library=tdeabc_groupware
Type=Service
ServiceTypes=KResources/Plugin
X-TDE-ResourceFamily=contact
diff --git a/tderesources/groupware/tdeabc_resourcegroupware.cpp b/tderesources/groupware/tdeabc_resourcegroupware.cpp
index e2503b83d..c46c09371 100644
--- a/tderesources/groupware/tdeabc_resourcegroupware.cpp
+++ b/tderesources/groupware/tdeabc_resourcegroupware.cpp
@@ -28,9 +28,9 @@
#include <libtdepim/groupwarejob.h>
-#include "kabc_groupwareprefs.h"
+#include "tdeabc_groupwareprefs.h"
-#include "kabc_resourcegroupware.h"
+#include "tdeabc_resourcegroupware.h"
using namespace KABC;
@@ -362,4 +362,4 @@ void ResourceGroupware::cancelLoad()
mProgress = 0;
}
-#include "kabc_resourcegroupware.moc"
+#include "tdeabc_resourcegroupware.moc"
diff --git a/tderesources/groupware/tdeabc_resourcegroupware_plugin.cpp b/tderesources/groupware/tdeabc_resourcegroupware_plugin.cpp
index 08a415745..b857496dd 100644
--- a/tderesources/groupware/tdeabc_resourcegroupware_plugin.cpp
+++ b/tderesources/groupware/tdeabc_resourcegroupware_plugin.cpp
@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include "kabc_resourcegroupware.h"
-#include "kabc_resourcegroupwareconfig.h"
+#include "tdeabc_resourcegroupware.h"
+#include "tdeabc_resourcegroupwareconfig.h"
#include <tdeglobal.h>
#include <tdelocale.h>
diff --git a/tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp b/tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp
index 35ca8596f..feb24db71 100644
--- a/tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp
+++ b/tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp
@@ -18,10 +18,10 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include "kabc_resourcegroupwareconfig.h"
+#include "tdeabc_resourcegroupwareconfig.h"
-#include "kabc_resourcegroupware.h"
-#include "kabc_groupwareprefs.h"
+#include "tdeabc_resourcegroupware.h"
+#include "tdeabc_groupwareprefs.h"
#include <kcombobox.h>
#include <kdebug.h>
@@ -205,4 +205,4 @@ void ResourceGroupwareConfig::updateAddressBookView()
#endif
}
-#include "kabc_resourcegroupwareconfig.moc"
+#include "tdeabc_resourcegroupwareconfig.moc"