From a8f3e727ae4e7c39788e58ed9bc1733d8de11897 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 16 Feb 2013 01:10:50 -0600 Subject: Fix build system references to kabc --- tderesources/carddav/CMakeLists.txt | 2 +- tderesources/carddav/Makefile.am | 2 +- tderesources/egroupware/CMakeLists.txt | 4 ++-- tderesources/egroupware/Makefile.am | 4 ++-- tderesources/egroupware/kabc_resourcexmlrpc.h | 2 +- tderesources/groupdav/CMakeLists.txt | 4 ++-- tderesources/groupdav/Makefile.am | 6 +++--- tderesources/groupware/Makefile.am | 2 +- tderesources/groupwise/CMakeLists.txt | 2 +- tderesources/groupwise/Makefile.am | 2 +- tderesources/groupwise/tdeioslave/groupwise.cpp | 2 +- tderesources/kolab/kabc/CMakeLists.txt | 4 ++-- tderesources/kolab/kabc/Makefile.am | 2 +- tderesources/lib/addressbookadaptor.cpp | 2 +- tderesources/newexchange/CMakeLists.txt | 2 +- tderesources/newexchange/Makefile.am | 2 +- tderesources/scalix/kabc/CMakeLists.txt | 4 ++-- tderesources/scalix/kabc/Makefile.am | 2 +- tderesources/slox/CMakeLists.txt | 2 +- tderesources/slox/Makefile.am | 4 ++-- tderesources/slox/kabcresourceslox.h | 2 +- 21 files changed, 29 insertions(+), 29 deletions(-) (limited to 'tderesources') diff --git a/tderesources/carddav/CMakeLists.txt b/tderesources/carddav/CMakeLists.txt index 36e086b4..491ea2ae 100644 --- a/tderesources/carddav/CMakeLists.txt +++ b/tderesources/carddav/CMakeLists.txt @@ -30,7 +30,7 @@ link_directories( install( FILES kabc_carddav.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc ) + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) ##### kabc_carddav (module) ##################### diff --git a/tderesources/carddav/Makefile.am b/tderesources/carddav/Makefile.am index b82849df..3b47f2ab 100644 --- a/tderesources/carddav/Makefile.am +++ b/tderesources/carddav/Makefile.am @@ -26,7 +26,7 @@ kabc_carddav_la_LDFLAGS = $(all_libraries) -module -no-undefined $(KDE_PLUGIN) kabc_carddav_la_LIBADD = libkabc_carddav.la kabc_carddav_la_COMPILE_FIRST = prefsskel.h -kabc_servicedir = $(kde_servicesdir)/tderesources/kabc +kabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc kabc_service_DATA = kabc_carddav.desktop METASOURCES = AUTO diff --git a/tderesources/egroupware/CMakeLists.txt b/tderesources/egroupware/CMakeLists.txt index ac6182f1..294b1067 100644 --- a/tderesources/egroupware/CMakeLists.txt +++ b/tderesources/egroupware/CMakeLists.txt @@ -28,12 +28,12 @@ link_directories( install( FILES kabc_resourcexmlrpc.h kcal_resourcexmlrpc.h - DESTINATION ${INCLUDE_INSTALL_DIR}/kabc ) + DESTINATION ${INCLUDE_INSTALL_DIR}/tdeabc ) ##### other data ################################ -install( FILES kabc_xmlrpc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc ) +install( FILES kabc_xmlrpc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) install( FILES kcal_xmlrpc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) install( FILES knotes_xmlrpc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/knotes ) diff --git a/tderesources/egroupware/Makefile.am b/tderesources/egroupware/Makefile.am index 31a6702b..b3b7206c 100644 --- a/tderesources/egroupware/Makefile.am +++ b/tderesources/egroupware/Makefile.am @@ -39,7 +39,7 @@ libknotes_xmlrpc_la_LIBADD = $(top_builddir)/libkcal/libkcal.la -ltdeprint \ $(top_builddir)/libtdepim/libtdepim.la \ libegwcommon.la -kabcincludedir = $(includedir)/kabc +kabcincludedir = $(includedir)/tdeabc kabcinclude_HEADERS = kabc_resourcexmlrpc.h kcal_resourcexmlrpc.h kde_module_LTLIBRARIES = kabc_xmlrpc.la kcal_xmlrpc.la knotes_xmlrpc.la @@ -56,7 +56,7 @@ knotes_xmlrpc_la_SOURCES = knotes_resourcexmlrpcplugin.cpp knotes_xmlrpc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) knotes_xmlrpc_la_LIBADD = libknotes_xmlrpc.la -kabc_servicedir = $(kde_servicesdir)/tderesources/kabc +kabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc kabc_service_DATA = kabc_xmlrpc.desktop kcal_servicedir = $(kde_servicesdir)/tderesources/kcal diff --git a/tderesources/egroupware/kabc_resourcexmlrpc.h b/tderesources/egroupware/kabc_resourcexmlrpc.h index d9b745aa..b4b6411a 100644 --- a/tderesources/egroupware/kabc_resourcexmlrpc.h +++ b/tderesources/egroupware/kabc_resourcexmlrpc.h @@ -24,7 +24,7 @@ #include #include -#include "libtdepim/kabcresourcecached.h" +#include "libtdepim/tdeabcresourcecached.h" class TDEConfig; class Synchronizer; diff --git a/tderesources/groupdav/CMakeLists.txt b/tderesources/groupdav/CMakeLists.txt index bc903d00..f85244b3 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/kabc ) -install( FILES uninstall.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc RENAME kabc_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) ##### kcal_groupdav (module) #################### diff --git a/tderesources/groupdav/Makefile.am b/tderesources/groupdav/Makefile.am index cbc9418b..3b04b2fb 100644 --- a/tderesources/groupdav/Makefile.am +++ b/tderesources/groupdav/Makefile.am @@ -34,15 +34,15 @@ kabc_groupdav_la_LIBADD = libkabc_groupdav.la kcal_servicedir = $(kde_servicesdir)/tderesources/kcal kcal_service_DATA = kcal_groupdav.desktop -kabc_servicedir = $(kde_servicesdir)/tderesources/kabc +kabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc kabc_service_DATA = kabc_groupdav.desktop METASOURCES = AUTO install-data-local: uninstall.desktop - $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)/tderesources/kabc + $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)/tderesources/tdeabc $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)/tderesources/kcal - $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_servicesdir)/tderesources/tdeabc/kabc_opengroupware.desktop + $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_servicesdir)/tderesources/tdeabc/tdeabc_opengroupware.desktop $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_servicesdir)/tderesources/kcal/kcal_opengroupware.desktop messages: rc.cpp diff --git a/tderesources/groupware/Makefile.am b/tderesources/groupware/Makefile.am index 08c257ba..35138a0d 100644 --- a/tderesources/groupware/Makefile.am +++ b/tderesources/groupware/Makefile.am @@ -33,7 +33,7 @@ kabc_groupware_la_LIBADD = libkabc_groupware.la kcal_servicedir = $(kde_servicesdir)/tderesources/kcal kcal_service_DATA = kcal_groupware.desktop -kabc_servicedir = $(kde_servicesdir)/tderesources/kabc +kabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc kabc_service_DATA = kabc_groupware.desktop METASOURCES = AUTO diff --git a/tderesources/groupwise/CMakeLists.txt b/tderesources/groupwise/CMakeLists.txt index a5617229..f13a96f6 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/kabc ) +install( FILES kabc_groupwise.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) ##### kcal_groupwise (module) ################### diff --git a/tderesources/groupwise/Makefile.am b/tderesources/groupwise/Makefile.am index 486e8977..14c1320c 100644 --- a/tderesources/groupwise/Makefile.am +++ b/tderesources/groupwise/Makefile.am @@ -37,7 +37,7 @@ kabc_groupwise_la_LIBADD = libkabc_groupwise.la kcal_servicedir = $(kde_servicesdir)/tderesources/kcal kcal_service_DATA = kcal_groupwise.desktop -kabc_servicedir = $(kde_servicesdir)/tderesources/kabc +kabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc kabc_service_DATA = kabc_groupwise.desktop METASOURCES = AUTO diff --git a/tderesources/groupwise/tdeioslave/groupwise.cpp b/tderesources/groupwise/tdeioslave/groupwise.cpp index 4eb24024..5464dae2 100644 --- a/tderesources/groupwise/tdeioslave/groupwise.cpp +++ b/tderesources/groupwise/tdeioslave/groupwise.cpp @@ -23,7 +23,7 @@ #include -#include +#include #include #include diff --git a/tderesources/kolab/kabc/CMakeLists.txt b/tderesources/kolab/kabc/CMakeLists.txt index e4e3e00c..cd137125 100644 --- a/tderesources/kolab/kabc/CMakeLists.txt +++ b/tderesources/kolab/kabc/CMakeLists.txt @@ -27,11 +27,11 @@ link_directories( install( FILES kolab.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc ) + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/../uninstall.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc RENAME imap.desktop ) diff --git a/tderesources/kolab/kabc/Makefile.am b/tderesources/kolab/kabc/Makefile.am index 80643fba..483cff5e 100644 --- a/tderesources/kolab/kabc/Makefile.am +++ b/tderesources/kolab/kabc/Makefile.am @@ -19,7 +19,7 @@ kabc_kolab_la_SOURCES = resourcekolab_plugin.cpp kabc_kolab_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined kabc_kolab_la_LIBADD = libkabckolab.la -servicedir = $(kde_servicesdir)/tderesources/kabc +servicedir = $(kde_servicesdir)/tderesources/tdeabc service_DATA = kolab.desktop install-data-local: $(srcdir)/../uninstall.desktop diff --git a/tderesources/lib/addressbookadaptor.cpp b/tderesources/lib/addressbookadaptor.cpp index 722b2947..fa62e791 100644 --- a/tderesources/lib/addressbookadaptor.cpp +++ b/tderesources/lib/addressbookadaptor.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include diff --git a/tderesources/newexchange/CMakeLists.txt b/tderesources/newexchange/CMakeLists.txt index 8323c310..deae1d25 100644 --- a/tderesources/newexchange/CMakeLists.txt +++ b/tderesources/newexchange/CMakeLists.txt @@ -27,7 +27,7 @@ link_directories( ##### other data ################################ install( FILES kcal_newexchange.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) -install( FILES kabc_newexchange.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc ) +install( FILES kabc_newexchange.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) ##### kcal_newexchange (module) ################# diff --git a/tderesources/newexchange/Makefile.am b/tderesources/newexchange/Makefile.am index 62a99b47..51435143 100644 --- a/tderesources/newexchange/Makefile.am +++ b/tderesources/newexchange/Makefile.am @@ -36,7 +36,7 @@ kabc_newexchange_la_LIBADD = libkabc_newexchange.la kcal_servicedir = $(kde_servicesdir)/tderesources/kcal kcal_service_DATA = kcal_newexchange.desktop -kabc_servicedir = $(kde_servicesdir)/tderesources/kabc +kabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc kabc_service_DATA = kabc_newexchange.desktop METASOURCES = AUTO diff --git a/tderesources/scalix/kabc/CMakeLists.txt b/tderesources/scalix/kabc/CMakeLists.txt index 99d42a33..3aed963d 100644 --- a/tderesources/scalix/kabc/CMakeLists.txt +++ b/tderesources/scalix/kabc/CMakeLists.txt @@ -26,12 +26,12 @@ link_directories( install( FILES scalix.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc ) + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) install( FILES ../uninstall.desktop RENAME imap.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc ) + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) ##### kabc_scalix (module) ###################### diff --git a/tderesources/scalix/kabc/Makefile.am b/tderesources/scalix/kabc/Makefile.am index 769c8dde..21e3ba17 100644 --- a/tderesources/scalix/kabc/Makefile.am +++ b/tderesources/scalix/kabc/Makefile.am @@ -19,7 +19,7 @@ kabc_scalix_la_SOURCES = resourcescalix_plugin.cpp kabc_scalix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined kabc_scalix_la_LIBADD = libkabcscalix.la -servicedir = $(kde_servicesdir)/tderesources/kabc +servicedir = $(kde_servicesdir)/tderesources/tdeabc service_DATA = scalix.desktop install-data-local: $(srcdir)/../uninstall.desktop diff --git a/tderesources/slox/CMakeLists.txt b/tderesources/slox/CMakeLists.txt index 51d974c4..10f70301 100644 --- a/tderesources/slox/CMakeLists.txt +++ b/tderesources/slox/CMakeLists.txt @@ -26,7 +26,7 @@ link_directories( ##### other data ################################ install( FILES kcal_slox.desktop kcal_ox.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) -install( FILES kabc_slox.desktop kabc_ox.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc ) +install( FILES kabc_slox.desktop kabc_ox.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) ##### kcal_slox (module) ######################## diff --git a/tderesources/slox/Makefile.am b/tderesources/slox/Makefile.am index 7189d633..48d0c0f6 100644 --- a/tderesources/slox/Makefile.am +++ b/tderesources/slox/Makefile.am @@ -42,10 +42,10 @@ testsloxaccounts_SOURCES = testsloxaccounts.cpp kcal_servicedir = $(kde_servicesdir)/tderesources/kcal kcal_service_DATA = kcal_slox.desktop kcal_ox.desktop -kabc_servicedir = $(kde_servicesdir)/tderesources/kabc +kabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc kabc_service_DATA = kabc_slox.desktop kabc_ox.desktop METASOURCES = AUTO messages: rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/kabc_slox.pot + $(XGETTEXT) *.cpp -o $(podir)/tdeabc_slox.pot diff --git a/tderesources/slox/kabcresourceslox.h b/tderesources/slox/kabcresourceslox.h index d51b06a1..b79167a1 100644 --- a/tderesources/slox/kabcresourceslox.h +++ b/tderesources/slox/kabcresourceslox.h @@ -23,7 +23,7 @@ #include "sloxbase.h" #include "webdavhandler.h" -#include +#include #include #include -- cgit v1.2.3