Fix build system references to kabc

pull/16/head
Timothy Pearson 11 years ago
parent bd1e64d462
commit a6cec4c38c

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

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

@ -15,14 +15,14 @@ include_directories(
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}/tdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_BINARY_DIR}/kabc ${CMAKE_BINARY_DIR}/tdeabc
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/tdeio ${CMAKE_SOURCE_DIR}/tdeio
${CMAKE_SOURCE_DIR}/tdeio/tdeio ${CMAKE_SOURCE_DIR}/tdeio/tdeio
${CMAKE_SOURCE_DIR}/kabc ${CMAKE_SOURCE_DIR}/tdeabc
${CMAKE_SOURCE_DIR}/interfaces ${CMAKE_SOURCE_DIR}/interfaces
) )

@ -1,4 +1,4 @@
INCLUDES = -I$(top_srcdir)/tdeio -I$(top_srcdir) -I$(top_srcdir)/interfaces -I$(top_builddir)/interfaces -I$(top_srcdir)/kabc -I$(top_builddir)/kabc $(all_includes) INCLUDES = -I$(top_srcdir)/tdeio -I$(top_srcdir) -I$(top_srcdir)/interfaces -I$(top_builddir)/interfaces -I$(top_srcdir)/tdeabc -I$(top_builddir)/tdeabc $(all_includes)
lib_LTLIBRARIES = libtdetexteditor.la lib_LTLIBRARIES = libtdetexteditor.la

@ -1,4 +1,4 @@
Note: libkab is now obsolete. Please use libkabc in tdelibs/kabc. libkab is Note: libkab is now obsolete. Please use libkabc in tdelibs/tdeabc. libkab is
no longer installed. It's only needed for the conversion tool converting no longer installed. It's only needed for the conversion tool converting
libkab data to libkabc data. libkab data to libkabc data.

@ -1,7 +1,7 @@
SUBDIRS = vcard vcardparser . formats plugins scripts tests SUBDIRS = vcard vcardparser . formats plugins scripts tests
# Make sure $(all_includes) remains last! # Make sure $(all_includes) remains last!
INCLUDES = -I$(top_builddir)/kabc -I$(top_srcdir)/kabc -I$(top_srcdir)/kab \ INCLUDES = -I$(top_builddir)/tdeabc -I$(top_srcdir)/tdeabc -I$(top_srcdir)/kab \
-I$(srcdir)/vcard/include -I$(srcdir)/vcardparser/ \ -I$(srcdir)/vcard/include -I$(srcdir)/vcardparser/ \
-I$(srcdir)/vcard/include/generated \ -I$(srcdir)/vcard/include/generated \
-I$(srcdir)/vcardparser $(all_includes) -I$(srcdir)/vcardparser $(all_includes)
@ -38,7 +38,7 @@ libkabc_la_SOURCES = \
sortmode.cpp sortmode.cpp
kabcincludedir = $(includedir)/kabc kabcincludedir = $(includedir)/tdeabc
kabcinclude_HEADERS = address.h addressbook.h addressee.h addresseedialog.h \ kabcinclude_HEADERS = address.h addressbook.h addressee.h addresseedialog.h \
agent.h distributionlist.h distributionlistdialog.h distributionlisteditor.h \ agent.h distributionlist.h distributionlistdialog.h distributionlisteditor.h \
errorhandler.h field.h format.h formatfactory.h formatplugin.h geo.h key.h \ errorhandler.h field.h format.h formatfactory.h formatplugin.h geo.h key.h \
@ -65,7 +65,7 @@ managerdir = $(kde_servicesdir)/tderesources
DOXYGEN_REFERENCES = tdecore tdeui DOXYGEN_REFERENCES = tdecore tdeui
map_DATA = countrytransl.map map_DATA = countrytransl.map
mapdir = $(kde_datadir)/kabc mapdir = $(kde_datadir)/tdeabc
EXTRA_DIST = $(map_DATA) EXTRA_DIST = $(map_DATA)

@ -10,8 +10,8 @@
################################################# #################################################
include_directories( include_directories(
${CMAKE_BINARY_DIR}/kabc ${CMAKE_BINARY_DIR}/tdeabc
${CMAKE_SOURCE_DIR}/kabc ${CMAKE_SOURCE_DIR}/tdeabc
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/tdecore ${CMAKE_BINARY_DIR}/tdecore

@ -1,4 +1,4 @@
INCLUDES = -I$(top_srcdir)/kabc -I$(top_builddir)/kabc $(all_includes) INCLUDES = -I$(top_srcdir)/tdeabc -I$(top_builddir)/tdeabc $(all_includes)
kde_module_LTLIBRARIES = kabcformat_binary.la kde_module_LTLIBRARIES = kabcformat_binary.la
@ -15,7 +15,7 @@ noinst_HEADERS = binaryformat.h
METASOURCES = AUTO METASOURCES = AUTO
messages: rc.cpp messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kabcformat_binary.pot $(XGETTEXT) *.cpp -o $(podir)/tdeabcformat_binary.pot
linkdir = $(kde_datadir)/tdeabc/formats linkdir = $(kde_datadir)/tdeabc/formats
link_DATA = binary.desktop link_DATA = binary.desktop

@ -11,8 +11,8 @@
include_directories( include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/kabc ${CMAKE_BINARY_DIR}/tdeabc
${CMAKE_SOURCE_DIR}/kabc ${CMAKE_SOURCE_DIR}/tdeabc
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/tdecore ${CMAKE_BINARY_DIR}/tdecore
@ -34,12 +34,12 @@ link_directories(
install( FILES install( FILES
resourcedir.h resourcedir.h
DESTINATION ${INCLUDE_INSTALL_DIR}/kabc ) DESTINATION ${INCLUDE_INSTALL_DIR}/tdeabc )
##### other data ################################ ##### other data ################################
install( FILES dir.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc ) install( FILES dir.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc )
##### kabc_dir (library) ######################## ##### kabc_dir (library) ########################

@ -1,4 +1,4 @@
INCLUDES = -I$(top_builddir)/kabc -I$(top_srcdir)/kabc -I$(top_builddir) $(all_includes) INCLUDES = -I$(top_builddir)/tdeabc -I$(top_srcdir)/tdeabc -I$(top_builddir) $(all_includes)
# these are the headers for your project # these are the headers for your project
noinst_HEADERS = resourcedirconfig.h noinst_HEADERS = resourcedirconfig.h
@ -17,12 +17,12 @@ kabc_dir_la_LIBADD = libkabc_dir.la $(LIB_QT) $(LIB_TDECORE)
METASOURCES = AUTO METASOURCES = AUTO
messages: rc.cpp messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kabc_dir.pot $(XGETTEXT) *.cpp -o $(podir)/tdeabc_dir.pot
kabcincludedir = $(includedir)/kabc kabcincludedir = $(includedir)/tdeabc
kabcinclude_HEADERS = resourcedir.h kabcinclude_HEADERS = resourcedir.h
servicedir = $(kde_servicesdir)/tderesources/kabc servicedir = $(kde_servicesdir)/tderesources/tdeabc
service_DATA = dir.desktop service_DATA = dir.desktop
resourcedirplugin.lo: ../../addressee.h resourcedirplugin.lo: ../../addressee.h

@ -1,4 +1,4 @@
INCLUDES = -I$(top_builddir)/kabc -I$(top_srcdir)/kabc $(all_includes) INCLUDES = -I$(top_builddir)/tdeabc -I$(top_srcdir)/tdeabc $(all_includes)
# these are the headers for your project # these are the headers for your project
noinst_HEADERS = resourceevo.h dbwrapper.h noinst_HEADERS = resourceevo.h dbwrapper.h
@ -13,7 +13,7 @@ kabc_evo_la_LIBADD = ../../../tdeabc/libkabc.la ../../../tdeui/libtdeui.la -ldb
METASOURCES = AUTO METASOURCES = AUTO
messages: rc.cpp messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kabc_evolution.pot $(XGETTEXT) *.cpp -o $(podir)/tdeabc_evolution.pot
servicedir = $(kde_servicesdir)/tderesources/kabc servicedir = $(kde_servicesdir)/tderesources/tdeabc
service_DATA = evolution.desktop service_DATA = evolution.desktop

@ -11,8 +11,8 @@
include_directories( include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/kabc ${CMAKE_BINARY_DIR}/tdeabc
${CMAKE_SOURCE_DIR}/kabc ${CMAKE_SOURCE_DIR}/tdeabc
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/tdecore ${CMAKE_BINARY_DIR}/tdecore
@ -34,12 +34,12 @@ link_directories(
install( FILES install( FILES
resourcefile.h resourcefile.h
DESTINATION ${INCLUDE_INSTALL_DIR}/kabc ) DESTINATION ${INCLUDE_INSTALL_DIR}/tdeabc )
##### other data ################################ ##### other data ################################
install( FILES file.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc ) install( FILES file.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc )
##### kabc_file (library) ####################### ##### kabc_file (library) #######################

@ -1,4 +1,4 @@
INCLUDES = -I$(top_builddir)/kabc -I$(top_srcdir)/kabc $(all_includes) INCLUDES = -I$(top_builddir)/tdeabc -I$(top_srcdir)/tdeabc $(all_includes)
# these are the headers for your project # these are the headers for your project
noinst_HEADERS = resourcefileconfig.h noinst_HEADERS = resourcefileconfig.h
@ -19,10 +19,10 @@ kabc_file_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
METASOURCES = AUTO METASOURCES = AUTO
messages: rc.cpp messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kabc_file.pot $(XGETTEXT) *.cpp -o $(podir)/tdeabc_file.pot
kabcincludedir = $(includedir)/kabc kabcincludedir = $(includedir)/tdeabc
kabcinclude_HEADERS = resourcefile.h kabcinclude_HEADERS = resourcefile.h
servicedir = $(kde_servicesdir)/tderesources/kabc servicedir = $(kde_servicesdir)/tderesources/tdeabc
service_DATA = file.desktop service_DATA = file.desktop

@ -11,8 +11,8 @@
include_directories( include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/kabc ${CMAKE_BINARY_DIR}/tdeabc
${CMAKE_SOURCE_DIR}/kabc ${CMAKE_SOURCE_DIR}/tdeabc
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/tdecore ${CMAKE_BINARY_DIR}/tdecore
@ -34,12 +34,12 @@ link_directories(
install( FILES install( FILES
resourceldaptdeio.h resourceldaptdeio.h
DESTINATION ${INCLUDE_INSTALL_DIR}/kabc ) DESTINATION ${INCLUDE_INSTALL_DIR}/tdeabc )
##### other data ################################ ##### other data ################################
install( FILES ldaptdeio.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc ) install( FILES ldaptdeio.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc )
##### kabc_ldaptdeio ############################## ##### kabc_ldaptdeio ##############################

@ -1,4 +1,4 @@
INCLUDES = -I$(top_srcdir)/kabc -I$(top_builddir)/kabc $(all_includes) INCLUDES = -I$(top_srcdir)/tdeabc -I$(top_builddir)/tdeabc $(all_includes)
# these are the headers for your project # these are the headers for your project
noinst_HEADERS = resourceldaptdeioconfig.h noinst_HEADERS = resourceldaptdeioconfig.h
@ -17,12 +17,12 @@ kabc_ldaptdeio_la_LIBADD = libkabc_ldaptdeio.la $(LIB_QT) $(LIB_TDECORE)
METASOURCES = AUTO METASOURCES = AUTO
messages: rc.cpp messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kabc_ldaptdeio.pot $(XGETTEXT) *.cpp -o $(podir)/tdeabc_ldaptdeio.pot
kabcincludedir = $(includedir)/kabc kabcincludedir = $(includedir)/tdeabc
kabcinclude_HEADERS = resourceldaptdeio.h kabcinclude_HEADERS = resourceldaptdeio.h
servicedir = $(kde_servicesdir)/tderesources/kabc servicedir = $(kde_servicesdir)/tderesources/tdeabc
service_DATA = ldaptdeio.desktop service_DATA = ldaptdeio.desktop
resourceldaptdeioplugin.lo: ../../addressee.h resourceldaptdeioplugin.lo: ../../addressee.h

@ -11,8 +11,8 @@
include_directories( include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/kabc ${CMAKE_BINARY_DIR}/tdeabc
${CMAKE_SOURCE_DIR}/kabc ${CMAKE_SOURCE_DIR}/tdeabc
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/tdecore ${CMAKE_BINARY_DIR}/tdecore
@ -34,12 +34,12 @@ link_directories(
install( FILES install( FILES
resourcenet.h resourcenet.h
DESTINATION ${INCLUDE_INSTALL_DIR}/kabc ) DESTINATION ${INCLUDE_INSTALL_DIR}/tdeabc )
##### other data ################################ ##### other data ################################
install( FILES net.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc ) install( FILES net.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc )
##### kabc_net (library) ######################## ##### kabc_net (library) ########################

@ -1,4 +1,4 @@
INCLUDES = -I$(top_srcdir)/kabc -I$(top_builddir)/kabc $(all_includes) INCLUDES = -I$(top_srcdir)/tdeabc -I$(top_builddir)/tdeabc $(all_includes)
# these are the headers for your project # these are the headers for your project
noinst_HEADERS = resourcenetconfig.h noinst_HEADERS = resourcenetconfig.h
@ -17,12 +17,12 @@ kabc_net_la_LIBADD = libkabc_net.la
METASOURCES = AUTO METASOURCES = AUTO
messages: rc.cpp messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kabc_net.pot $(XGETTEXT) *.cpp -o $(podir)/tdeabc_net.pot
kabcincludedir = $(includedir)/kabc kabcincludedir = $(includedir)/tdeabc
kabcinclude_HEADERS = resourcenet.h kabcinclude_HEADERS = resourcenet.h
servicedir = $(kde_servicesdir)/tderesources/kabc servicedir = $(kde_servicesdir)/tderesources/tdeabc
service_DATA = net.desktop service_DATA = net.desktop
resourcenetplugin.lo: ../../addressee.h resourcenetplugin.lo: ../../addressee.h

@ -1,4 +1,4 @@
INCLUDES = -I$(top_srcdir)/kabc -I$(top_builddir)/kabc $(all_includes) INCLUDES = -I$(top_srcdir)/tdeabc -I$(top_builddir)/tdeabc $(all_includes)
# these are the headers for your project # these are the headers for your project
noinst_HEADERS = resourcesql.h resourcesqlconfig.h noinst_HEADERS = resourcesql.h resourcesqlconfig.h
@ -13,7 +13,7 @@ kabc_sql_la_LIBADD = ../../libkabc.la ../../../tdeui/libtdeui.la
METASOURCES = AUTO METASOURCES = AUTO
messages: rc.cpp messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kabc_sql.pot $(XGETTEXT) *.cpp -o $(podir)/tdeabc_sql.pot
linkdir = $(kde_datadir)/tderesources/contact linkdir = $(kde_datadir)/tderesources/contact
link_DATA = sql.desktop link_DATA = sql.desktop

@ -1,5 +1,5 @@
# Make sure $(all_includes) remains last! # Make sure $(all_includes) remains last!
INCLUDES = -I$(top_builddir)/kabc -I$(top_srcdir)/kabc -I$(top_srcdir)/kab \ INCLUDES = -I$(top_builddir)/tdeabc -I$(top_srcdir)/tdeabc -I$(top_srcdir)/kab \
-I$(srcdir)/../vcardparser/ -I$(srcdir)/../vcard/include \ -I$(srcdir)/../vcardparser/ -I$(srcdir)/../vcard/include \
-I$(srcdir)/../vcard/include/generated \ -I$(srcdir)/../vcard/include/generated \
-I$(srcdir)/../vcardparser $(all_includes) -I$(srcdir)/../vcardparser $(all_includes)

@ -24,7 +24,7 @@ link_directories(
install( FILES install( FILES
vcard.h vcardline.h vcardparser.h vcard.h vcardline.h vcardparser.h
DESTINATION ${INCLUDE_INSTALL_DIR}/kabc ) DESTINATION ${INCLUDE_INSTALL_DIR}/tdeabc )
##### vcards #################################### ##### vcards ####################################

@ -1,9 +1,9 @@
INCLUDES = -I$(top_builddir)/kabc -I$(top_srcdir)/kabc $(all_includes) INCLUDES = -I$(top_builddir)/tdeabc -I$(top_srcdir)/tdeabc $(all_includes)
noinst_LTLIBRARIES = libvcards.la noinst_LTLIBRARIES = libvcards.la
libvcards_la_SOURCES = vcard.cpp vcardline.cpp vcardparser.cpp libvcards_la_SOURCES = vcard.cpp vcardline.cpp vcardparser.cpp
vcardsincludedir = $(includedir)/kabc vcardsincludedir = $(includedir)/tdeabc
vcardsinclude_HEADERS = vcard.h vcardline.h vcardparser.h vcardsinclude_HEADERS = vcard.h vcardline.h vcardparser.h
check_PROGRAMS = testread testwrite testread2 check_PROGRAMS = testread testwrite testread2

@ -5,7 +5,7 @@ KDE RESOURCES
------------- -------------
The KDE Resource framework can be used to manage resources of The KDE Resource framework can be used to manage resources of
different types, organized in families. The Resource framework is different types, organized in families. The Resource framework is
currently used for addressbook resources in tdelibs/kabc and for currently used for addressbook resources in tdelibs/tdeabc and for
calendar resources in libkcal. calendar resources in libkcal.
A resource family represents stores of information of a certain kind A resource family represents stores of information of a certain kind
(appointments, contacts). A resource type class represents a way in (appointments, contacts). A resource type class represents a way in

@ -439,7 +439,7 @@ const char * const packages[] = {
"kdepasswd", "kdepasswd",
"tdepimlibs", "tdepimlibs",
"tdepimlibs/gpgme++", "tdepimlibs/gpgme++",
"tdepimlibs/kabc", "tdepimlibs/tdeabc",
"tdepimlibs/kblog", "tdepimlibs/kblog",
"tdepimlibs/kcal", "tdepimlibs/kcal",
"tdepimlibs/kldap", "tdepimlibs/kldap",

@ -10,7 +10,7 @@ LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX \
$$KDELIBDESTDIR\kdewin32$$KDELIB_SUFFIX $$KDELIBDESTDIR\kdewin32$$KDELIB_SUFFIX
INCLUDEPATH += $(KDELIBS)/interfaces $(KDELIBS)/interfaces/tdetexteditor \ INCLUDEPATH += $(KDELIBS)/interfaces $(KDELIBS)/interfaces/tdetexteditor \
$(KDELIBS)/kabc $(KDELIBS)/tdeabc
TARGET = tdetexteditor$$KDEBUG TARGET = tdetexteditor$$KDEBUG

@ -13,7 +13,7 @@ DESTDIR = $$KDELIBDESTDIR/trinity/plugins/designer
LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeio$$KDELIB_SUFFIX \ LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeio$$KDELIB_SUFFIX \
$$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \
$$KDELIBDESTDIR/kabc$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeutils$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/tdeabc$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeutils$$KDELIB_SUFFIX \
$$KDELIBDESTDIR/tderesources$$KDELIB_SUFFIX $$KDELIBDESTDIR/tderesources$$KDELIB_SUFFIX
SOURCES += classpreviews.cpp kdewidgets.cpp SOURCES += classpreviews.cpp kdewidgets.cpp

Loading…
Cancel
Save