TDE
/
tdepim
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix build system references to kabc

Browse Source
pull/21/head
Timothy Pearson 11 years ago
parent 914b878361
commit a8f3e727ae
34 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File

2
admin

@ -1 +1 @@
Subproject commit 50c595422f05af2f2e1457ee3d27f8e5ce1ab35d
Subproject commit 39466b7b95f25a3e0f6da52b156b194b10cbac9d

2
cmake

@ -1 +1 @@
Subproject commit 5438330f961347e3026326e78e0e70a1ec083aaf
Subproject commit 274366fb8b90704586d7beef216b765cc0688b08

2
kabc/frontend/Makefile.am
Unescape View File

@ -1,4 +1,4 @@
INCLUDES = -I$(includedir)/kabc $(all_includes)
INCLUDES = -I$(includedir)/tdeabc $(all_includes)
METASOURCES = AUTO

4
kabc/kabc2mutt/Makefile.am
Unescape View File

@ -1,4 +1,4 @@
INCLUDES = -I$(includedir)/kabc $(all_includes)
INCLUDES = -I$(includedir)/tdeabc $(all_includes)
METASOURCES = AUTO
@ -9,5 +9,5 @@ kabc2mutt_LDADD = -lkabc $(LIB_TDECORE)
kabc2mutt_SOURCES = kabc2mutt.cpp main.cpp
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kabc2mutt.pot
$(XGETTEXT) *.cpp -o $(podir)/tdeabc2mutt.pot

2
kabc/kabcdistlistupdater/Makefile.am
Unescape View File

@ -1,4 +1,4 @@
INCLUDES = -I$(includedir)/kabc -I$(top_srcdir) $(all_includes)
INCLUDES = -I$(includedir)/tdeabc -I$(top_srcdir) $(all_includes)
METASOURCES = AUTO

2
kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
Unescape View File

@ -89,7 +89,7 @@ KParts::ReadOnlyPart* KAddressbookPlugin::createPart()
TQStringList KAddressbookPlugin::configModules() const
{
TQStringList modules;
modules << "PIM/kabconfig.desktop" << "PIM/kabldapconfig.desktop";
modules << "PIM/tdeabconfig.desktop" << "PIM/kabldapconfig.desktop";
return modules;
}

2
libtdepim/resourceabc.h
Unescape View File

@ -29,7 +29,7 @@
#include <tqmap.h>
#include <tdepimmacros.h>
// This is here because it can't go to tdelibs/kabc yet, but ultimately
// This is here because it can't go to tdelibs/tdeabc yet, but ultimately
// it should probably go there (maybe redesigned to have a real object
// for subresources).

2
tdeioslaves/opengroupware/opengroupware.cpp
Unescape View File

@ -27,7 +27,7 @@
#include <tdeio/davjob.h>
#include <tdelocale.h>
#include <libtdepim/kabcresourcecached.h>
#include <libtdepim/tdeabcresourcecached.h>
#include <libkcal/freebusy.h>
#include <libkcal/icalformat.h>

2
tderesources/carddav/CMakeLists.txt
Unescape View File

@ -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) #####################

2
tderesources/carddav/Makefile.am
Unescape View File

@ -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

4
tderesources/egroupware/CMakeLists.txt
Unescape View File

@ -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 )

4
tderesources/egroupware/Makefile.am
Unescape View File

@ -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

2
tderesources/egroupware/kabc_resourcexmlrpc.h
Unescape View File

@ -24,7 +24,7 @@
#include <tqmap.h>
#include <tdepimmacros.h>
#include "libtdepim/kabcresourcecached.h"
#include "libtdepim/tdeabcresourcecached.h"
class TDEConfig;
class Synchronizer;

4
tderesources/groupdav/CMakeLists.txt
Unescape View File

@ -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) ####################

6
tderesources/groupdav/Makefile.am
Unescape View File

@ -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

2
tderesources/groupware/Makefile.am
Unescape View File

@ -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

2
tderesources/groupwise/CMakeLists.txt
Unescape View File

@ -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) ###################

2
tderesources/groupwise/Makefile.am
Unescape View File

@ -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

2
tderesources/groupwise/tdeioslave/groupwise.cpp
Unescape View File

@ -23,7 +23,7 @@
#include <tqregexp.h>
#include <libtdepim/kabcresourcecached.h>
#include <libtdepim/tdeabcresourcecached.h>
#include <libkcal/freebusy.h>
#include <libkcal/icalformat.h>

4
tderesources/kolab/kabc/CMakeLists.txt
Unescape View File

@ -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 )

2
tderesources/kolab/kabc/Makefile.am
Unescape View File

@ -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

2
tderesources/lib/addressbookadaptor.cpp
Unescape View File

@ -25,7 +25,7 @@
#include <tdeabc/addressee.h>
#include <tdeabc/vcardconverter.h>
#include <libtdepim/kabcresourcecached.h>
#include <libtdepim/tdeabcresourcecached.h>
#include <tdeio/job.h>

2
tderesources/newexchange/CMakeLists.txt
Unescape View File

@ -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) #################

2
tderesources/newexchange/Makefile.am
Unescape View File

@ -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

4
tderesources/scalix/kabc/CMakeLists.txt
Unescape View File

@ -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) ######################

2
tderesources/scalix/kabc/Makefile.am
Unescape View File

@ -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

2
tderesources/slox/CMakeLists.txt
Unescape View File

@ -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) ########################

4
tderesources/slox/Makefile.am
Unescape View File

@ -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

2
tderesources/slox/kabcresourceslox.h
Unescape View File

@ -23,7 +23,7 @@
#include "sloxbase.h"
#include "webdavhandler.h"
#include <libtdepim/kabcresourcecached.h>
#include <libtdepim/tdeabcresourcecached.h>
#include <tdepimmacros.h>
#include <tdeabc/addressee.h>

6
wizards/Makefile.am
Unescape View File

@ -75,7 +75,7 @@ libgroupwisewizard_la_LIBADD = $(top_builddir)/tderesources/groupwise/libkcal_gr
$(top_builddir)/tderesources/groupwise/libkabc_groupwise.la \
$(top_builddir)/libtdepim/libtdepim.la \
$(top_builddir)/libkpimidentities/libkpimidentities.la
libgroupwisewizard_la_COMPILE_FIRST = $(top_builddir)/tderesources/groupwise/kabc_groupwiseprefs.h \
libgroupwisewizard_la_COMPILE_FIRST = $(top_builddir)/tderesources/groupwise/tdeabc_groupwiseprefs.h \
$(top_builddir)/tderesources/groupwise/kcal_groupwiseprefsbase.h
@ -117,8 +117,8 @@ kde_kcfg_DATA = egroupware.kcfg slox.kcfg kolab.kcfg groupwise.kcfg scalix.kcfg
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/tdepimwizards.pot
egroupwarewizard.lo: ../tderesources/egroupware/kabc_egroupwareprefs.h ../tderesources/egroupware/kcal_egroupwareprefs.h ../tderesources/egroupware/knotes_egroupwareprefs.h
egroupwarewizard.lo: ../tderesources/egroupware/tdeabc_egroupwareprefs.h ../tderesources/egroupware/kcal_egroupwareprefs.h ../tderesources/egroupware/knotes_egroupwareprefs.h
exchangewizard.lo: ../tderesources/lib/tderesources_groupwareprefs.h
sloxwizard.lo: ../tderesources/slox/kabcsloxprefs.h ../tderesources/slox/kcalsloxprefs.h
sloxwizard.lo: ../tderesources/slox/tdeabcsloxprefs.h ../tderesources/slox/kcalsloxprefs.h
xdg_apps_DATA = groupwarewizard.desktop

4
wizards/egroupwarewizard.cpp
Unescape View File

@ -21,8 +21,8 @@
#include "egroupwarewizard.h"
#include "egroupwareconfig.h"
#include "tderesources/egroupware/kabc_egroupwareprefs.h"
#include "tderesources/egroupware/kabc_resourcexmlrpc.h"
#include "tderesources/egroupware/tdeabc_egroupwareprefs.h"
#include "tderesources/egroupware/tdeabc_resourcexmlrpc.h"
#include "tderesources/egroupware/kcal_egroupwareprefs.h"
#include "tderesources/egroupware/kcal_resourcexmlrpc.h"
#include "tderesources/egroupware/knotes_egroupwareprefs.h"

2
wizards/exchangewizard.cpp
Unescape View File

@ -20,7 +20,7 @@
#include "exchangewizard.h"
#include "tderesources/newexchange/kabc_resourceexchange.h"
#include "tderesources/newexchange/tdeabc_resourceexchange.h"
#include "tderesources/newexchange/kcal_resourceexchange.h"
#include "tderesources/lib/folderconfig.h"

4
wizards/groupwisewizard.cpp
Unescape View File

@ -23,8 +23,8 @@
#include "groupwiseconfig.h"
#include "kmailchanges.h"
#include "tderesources/groupwise/kabc_groupwiseprefs.h"
#include "tderesources/groupwise/kabc_resourcegroupwise.h"
#include "tderesources/groupwise/tdeabc_groupwiseprefs.h"
#include "tderesources/groupwise/tdeabc_resourcegroupwise.h"
#include "tderesources/groupwise/kcal_groupwiseprefsbase.h"
#include "tderesources/groupwise/kcal_resourcegroupwise.h"

4
wizards/sloxwizard.cpp
Unescape View File

@ -21,8 +21,8 @@
#include "sloxwizard.h"
#include "sloxconfig.h"
#include "tderesources/slox/kabcsloxprefs.h"
#include "tderesources/slox/kabcresourceslox.h"
#include "tderesources/slox/tdeabcsloxprefs.h"
#include "tderesources/slox/tdeabcresourceslox.h"
#include "tderesources/slox/kcalsloxprefs.h"
#include "tderesources/slox/kcalresourceslox.h"

Write Preview
Loading…
Cancel
Save