Fix build system references to kabc

pull/21/head
Timothy Pearson 12 years ago
parent 914b878361
commit a8f3e727ae

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

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

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

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

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

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

@ -29,7 +29,7 @@
#include <tqmap.h> #include <tqmap.h>
#include <tdepimmacros.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 // it should probably go there (maybe redesigned to have a real object
// for subresources). // for subresources).

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

@ -30,7 +30,7 @@ link_directories(
install( install(
FILES kabc_carddav.desktop FILES kabc_carddav.desktop
DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc ) DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc )
##### kabc_carddav (module) ##################### ##### kabc_carddav (module) #####################

@ -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_LIBADD = libkabc_carddav.la
kabc_carddav_la_COMPILE_FIRST = prefsskel.h 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 kabc_service_DATA = kabc_carddav.desktop
METASOURCES = AUTO METASOURCES = AUTO

@ -28,12 +28,12 @@ link_directories(
install( FILES install( FILES
kabc_resourcexmlrpc.h kcal_resourcexmlrpc.h kabc_resourcexmlrpc.h kcal_resourcexmlrpc.h
DESTINATION ${INCLUDE_INSTALL_DIR}/kabc ) DESTINATION ${INCLUDE_INSTALL_DIR}/tdeabc )
##### other data ################################ ##### 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 kcal_xmlrpc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal )
install( FILES knotes_xmlrpc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/knotes ) install( FILES knotes_xmlrpc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/knotes )

@ -39,7 +39,7 @@ libknotes_xmlrpc_la_LIBADD = $(top_builddir)/libkcal/libkcal.la -ltdeprint \
$(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/libtdepim/libtdepim.la \
libegwcommon.la libegwcommon.la
kabcincludedir = $(includedir)/kabc kabcincludedir = $(includedir)/tdeabc
kabcinclude_HEADERS = kabc_resourcexmlrpc.h kcal_resourcexmlrpc.h kabcinclude_HEADERS = kabc_resourcexmlrpc.h kcal_resourcexmlrpc.h
kde_module_LTLIBRARIES = kabc_xmlrpc.la kcal_xmlrpc.la knotes_xmlrpc.la 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_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
knotes_xmlrpc_la_LIBADD = libknotes_xmlrpc.la 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 kabc_service_DATA = kabc_xmlrpc.desktop
kcal_servicedir = $(kde_servicesdir)/tderesources/kcal kcal_servicedir = $(kde_servicesdir)/tderesources/kcal

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

@ -28,8 +28,8 @@ link_directories(
install( FILES kcal_groupdav.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) 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 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 kabc_groupdav.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc )
install( FILES uninstall.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc RENAME kabc_opengroupware.desktop) install( FILES uninstall.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc RENAME kabc_opengroupware.desktop)
##### kcal_groupdav (module) #################### ##### kcal_groupdav (module) ####################

@ -34,15 +34,15 @@ kabc_groupdav_la_LIBADD = libkabc_groupdav.la
kcal_servicedir = $(kde_servicesdir)/tderesources/kcal kcal_servicedir = $(kde_servicesdir)/tderesources/kcal
kcal_service_DATA = kcal_groupdav.desktop kcal_service_DATA = kcal_groupdav.desktop
kabc_servicedir = $(kde_servicesdir)/tderesources/kabc kabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc
kabc_service_DATA = kabc_groupdav.desktop kabc_service_DATA = kabc_groupdav.desktop
METASOURCES = AUTO METASOURCES = AUTO
install-data-local: uninstall.desktop install-data-local: uninstall.desktop
$(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)/tderesources/kabc $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)/tderesources/tdeabc
$(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)/tderesources/kcal $(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 $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_servicesdir)/tderesources/kcal/kcal_opengroupware.desktop
messages: rc.cpp messages: rc.cpp

@ -33,7 +33,7 @@ kabc_groupware_la_LIBADD = libkabc_groupware.la
kcal_servicedir = $(kde_servicesdir)/tderesources/kcal kcal_servicedir = $(kde_servicesdir)/tderesources/kcal
kcal_service_DATA = kcal_groupware.desktop kcal_service_DATA = kcal_groupware.desktop
kabc_servicedir = $(kde_servicesdir)/tderesources/kabc kabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc
kabc_service_DATA = kabc_groupware.desktop kabc_service_DATA = kabc_groupware.desktop
METASOURCES = AUTO METASOURCES = AUTO

@ -29,7 +29,7 @@ link_directories(
##### other data ################################ ##### other data ################################
install( FILES kcal_groupwise.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) 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) ################### ##### kcal_groupwise (module) ###################

@ -37,7 +37,7 @@ kabc_groupwise_la_LIBADD = libkabc_groupwise.la
kcal_servicedir = $(kde_servicesdir)/tderesources/kcal kcal_servicedir = $(kde_servicesdir)/tderesources/kcal
kcal_service_DATA = kcal_groupwise.desktop kcal_service_DATA = kcal_groupwise.desktop
kabc_servicedir = $(kde_servicesdir)/tderesources/kabc kabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc
kabc_service_DATA = kabc_groupwise.desktop kabc_service_DATA = kabc_groupwise.desktop
METASOURCES = AUTO METASOURCES = AUTO

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

@ -27,11 +27,11 @@ link_directories(
install( install(
FILES kolab.desktop FILES kolab.desktop
DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc ) DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc )
install( install(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/../uninstall.desktop FILES ${CMAKE_CURRENT_SOURCE_DIR}/../uninstall.desktop
DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc
RENAME imap.desktop ) RENAME imap.desktop )

@ -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_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
kabc_kolab_la_LIBADD = libkabckolab.la kabc_kolab_la_LIBADD = libkabckolab.la
servicedir = $(kde_servicesdir)/tderesources/kabc servicedir = $(kde_servicesdir)/tderesources/tdeabc
service_DATA = kolab.desktop service_DATA = kolab.desktop
install-data-local: $(srcdir)/../uninstall.desktop install-data-local: $(srcdir)/../uninstall.desktop

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

@ -27,7 +27,7 @@ link_directories(
##### other data ################################ ##### other data ################################
install( FILES kcal_newexchange.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) 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) ################# ##### kcal_newexchange (module) #################

@ -36,7 +36,7 @@ kabc_newexchange_la_LIBADD = libkabc_newexchange.la
kcal_servicedir = $(kde_servicesdir)/tderesources/kcal kcal_servicedir = $(kde_servicesdir)/tderesources/kcal
kcal_service_DATA = kcal_newexchange.desktop kcal_service_DATA = kcal_newexchange.desktop
kabc_servicedir = $(kde_servicesdir)/tderesources/kabc kabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc
kabc_service_DATA = kabc_newexchange.desktop kabc_service_DATA = kabc_newexchange.desktop
METASOURCES = AUTO METASOURCES = AUTO

@ -26,12 +26,12 @@ link_directories(
install( install(
FILES scalix.desktop FILES scalix.desktop
DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc ) DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc )
install( install(
FILES ../uninstall.desktop FILES ../uninstall.desktop
RENAME imap.desktop RENAME imap.desktop
DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc ) DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc )
##### kabc_scalix (module) ###################### ##### kabc_scalix (module) ######################

@ -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_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
kabc_scalix_la_LIBADD = libkabcscalix.la kabc_scalix_la_LIBADD = libkabcscalix.la
servicedir = $(kde_servicesdir)/tderesources/kabc servicedir = $(kde_servicesdir)/tderesources/tdeabc
service_DATA = scalix.desktop service_DATA = scalix.desktop
install-data-local: $(srcdir)/../uninstall.desktop install-data-local: $(srcdir)/../uninstall.desktop

@ -26,7 +26,7 @@ link_directories(
##### other data ################################ ##### other data ################################
install( FILES kcal_slox.desktop kcal_ox.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) 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) ######################## ##### kcal_slox (module) ########################

@ -42,10 +42,10 @@ testsloxaccounts_SOURCES = testsloxaccounts.cpp
kcal_servicedir = $(kde_servicesdir)/tderesources/kcal kcal_servicedir = $(kde_servicesdir)/tderesources/kcal
kcal_service_DATA = kcal_slox.desktop kcal_ox.desktop 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 kabc_service_DATA = kabc_slox.desktop kabc_ox.desktop
METASOURCES = AUTO METASOURCES = AUTO
messages: rc.cpp messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kabc_slox.pot $(XGETTEXT) *.cpp -o $(podir)/tdeabc_slox.pot

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

@ -75,7 +75,7 @@ libgroupwisewizard_la_LIBADD = $(top_builddir)/tderesources/groupwise/libkcal_gr
$(top_builddir)/tderesources/groupwise/libkabc_groupwise.la \ $(top_builddir)/tderesources/groupwise/libkabc_groupwise.la \
$(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/libtdepim/libtdepim.la \
$(top_builddir)/libkpimidentities/libkpimidentities.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 $(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 messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/tdepimwizards.pot $(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 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 xdg_apps_DATA = groupwarewizard.desktop

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

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

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

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

Loading…
Cancel
Save