summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-16 01:10:13 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-16 01:10:13 -0600
commita6cec4c38c48127d90ca7d0eda0d5e558b93cafa (patch)
tree3f25302bdc5cdde5bc86a324dc2c489fb6358958
parentbd1e64d4628c4e8a72e1e1b999c1f12627592b62 (diff)
downloadtdelibs-a6cec4c38c48127d90ca7d0eda0d5e558b93cafa.tar.gz
tdelibs-a6cec4c38c48127d90ca7d0eda0d5e558b93cafa.zip
Fix build system references to kabc
m---------admin0
m---------cmake0
-rw-r--r--interfaces/tdetexteditor/CMakeLists.txt4
-rw-r--r--interfaces/tdetexteditor/Makefile.am2
-rw-r--r--kab/README2
-rw-r--r--tdeabc/Makefile.am6
-rw-r--r--tdeabc/formats/CMakeLists.txt4
-rw-r--r--tdeabc/formats/Makefile.am4
-rw-r--r--tdeabc/plugins/dir/CMakeLists.txt8
-rw-r--r--tdeabc/plugins/dir/Makefile.am8
-rw-r--r--tdeabc/plugins/evolution/Makefile.am6
-rw-r--r--tdeabc/plugins/file/CMakeLists.txt8
-rw-r--r--tdeabc/plugins/file/Makefile.am8
-rw-r--r--tdeabc/plugins/ldaptdeio/CMakeLists.txt8
-rw-r--r--tdeabc/plugins/ldaptdeio/Makefile.am8
-rw-r--r--tdeabc/plugins/net/CMakeLists.txt8
-rw-r--r--tdeabc/plugins/net/Makefile.am8
-rw-r--r--tdeabc/plugins/sql/Makefile.am4
-rw-r--r--tdeabc/tests/Makefile.am2
-rw-r--r--tdeabc/vcardparser/CMakeLists.txt2
-rw-r--r--tdeabc/vcardparser/Makefile.am4
-rw-r--r--tderesources/README.design2
-rw-r--r--tdeui/kdepackages.h2
-rw-r--r--win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro2
-rw-r--r--win/pro_files/kdewidgets/kdewidgets.pro2
25 files changed, 56 insertions, 56 deletions
diff --git a/admin b/admin
-Subproject 50c595422f05af2f2e1457ee3d27f8e5ce1ab35
+Subproject 39466b7b95f25a3e0f6da52b156b194b10cbac9
diff --git a/cmake b/cmake
-Subproject 5438330f961347e3026326e78e0e70a1ec083aa
+Subproject 274366fb8b90704586d7beef216b765cc0688b0
diff --git a/interfaces/tdetexteditor/CMakeLists.txt b/interfaces/tdetexteditor/CMakeLists.txt
index ca0176ce7..a0fea2f48 100644
--- a/interfaces/tdetexteditor/CMakeLists.txt
+++ b/interfaces/tdetexteditor/CMakeLists.txt
@@ -15,14 +15,14 @@ include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}/tdecore
- ${CMAKE_BINARY_DIR}/kabc
+ ${CMAKE_BINARY_DIR}/tdeabc
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/tdeio
${CMAKE_SOURCE_DIR}/tdeio/tdeio
- ${CMAKE_SOURCE_DIR}/kabc
+ ${CMAKE_SOURCE_DIR}/tdeabc
${CMAKE_SOURCE_DIR}/interfaces
)
diff --git a/interfaces/tdetexteditor/Makefile.am b/interfaces/tdetexteditor/Makefile.am
index 4b1590abe..4035a17f0 100644
--- a/interfaces/tdetexteditor/Makefile.am
+++ b/interfaces/tdetexteditor/Makefile.am
@@ -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
diff --git a/kab/README b/kab/README
index 8ddc6ecec..c8f0306ed 100644
--- a/kab/README
+++ b/kab/README
@@ -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
libkab data to libkabc data.
diff --git a/tdeabc/Makefile.am b/tdeabc/Makefile.am
index 57e72aec2..afdace9a9 100644
--- a/tdeabc/Makefile.am
+++ b/tdeabc/Makefile.am
@@ -1,7 +1,7 @@
SUBDIRS = vcard vcardparser . formats plugins scripts tests
# 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/generated \
-I$(srcdir)/vcardparser $(all_includes)
@@ -38,7 +38,7 @@ libkabc_la_SOURCES = \
sortmode.cpp
-kabcincludedir = $(includedir)/kabc
+kabcincludedir = $(includedir)/tdeabc
kabcinclude_HEADERS = address.h addressbook.h addressee.h addresseedialog.h \
agent.h distributionlist.h distributionlistdialog.h distributionlisteditor.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
map_DATA = countrytransl.map
-mapdir = $(kde_datadir)/kabc
+mapdir = $(kde_datadir)/tdeabc
EXTRA_DIST = $(map_DATA)
diff --git a/tdeabc/formats/CMakeLists.txt b/tdeabc/formats/CMakeLists.txt
index d7a9e0fc9..5b1bd1162 100644
--- a/tdeabc/formats/CMakeLists.txt
+++ b/tdeabc/formats/CMakeLists.txt
@@ -10,8 +10,8 @@
#################################################
include_directories(
- ${CMAKE_BINARY_DIR}/kabc
- ${CMAKE_SOURCE_DIR}/kabc
+ ${CMAKE_BINARY_DIR}/tdeabc
+ ${CMAKE_SOURCE_DIR}/tdeabc
${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/tdecore
diff --git a/tdeabc/formats/Makefile.am b/tdeabc/formats/Makefile.am
index d769d88d7..c50cc4e3e 100644
--- a/tdeabc/formats/Makefile.am
+++ b/tdeabc/formats/Makefile.am
@@ -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
@@ -15,7 +15,7 @@ noinst_HEADERS = binaryformat.h
METASOURCES = AUTO
messages: rc.cpp
- $(XGETTEXT) *.cpp -o $(podir)/kabcformat_binary.pot
+ $(XGETTEXT) *.cpp -o $(podir)/tdeabcformat_binary.pot
linkdir = $(kde_datadir)/tdeabc/formats
link_DATA = binary.desktop
diff --git a/tdeabc/plugins/dir/CMakeLists.txt b/tdeabc/plugins/dir/CMakeLists.txt
index fd4161342..2d648622c 100644
--- a/tdeabc/plugins/dir/CMakeLists.txt
+++ b/tdeabc/plugins/dir/CMakeLists.txt
@@ -11,8 +11,8 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kabc
- ${CMAKE_SOURCE_DIR}/kabc
+ ${CMAKE_BINARY_DIR}/tdeabc
+ ${CMAKE_SOURCE_DIR}/tdeabc
${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/tdecore
@@ -34,12 +34,12 @@ link_directories(
install( FILES
resourcedir.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kabc )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/tdeabc )
##### 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) ########################
diff --git a/tdeabc/plugins/dir/Makefile.am b/tdeabc/plugins/dir/Makefile.am
index 94ddad3cc..4daeaa972 100644
--- a/tdeabc/plugins/dir/Makefile.am
+++ b/tdeabc/plugins/dir/Makefile.am
@@ -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
noinst_HEADERS = resourcedirconfig.h
@@ -17,12 +17,12 @@ kabc_dir_la_LIBADD = libkabc_dir.la $(LIB_QT) $(LIB_TDECORE)
METASOURCES = AUTO
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
-servicedir = $(kde_servicesdir)/tderesources/kabc
+servicedir = $(kde_servicesdir)/tderesources/tdeabc
service_DATA = dir.desktop
resourcedirplugin.lo: ../../addressee.h
diff --git a/tdeabc/plugins/evolution/Makefile.am b/tdeabc/plugins/evolution/Makefile.am
index 2c22cf376..de62b2f17 100644
--- a/tdeabc/plugins/evolution/Makefile.am
+++ b/tdeabc/plugins/evolution/Makefile.am
@@ -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
noinst_HEADERS = resourceevo.h dbwrapper.h
@@ -13,7 +13,7 @@ kabc_evo_la_LIBADD = ../../../tdeabc/libkabc.la ../../../tdeui/libtdeui.la -ldb
METASOURCES = AUTO
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
diff --git a/tdeabc/plugins/file/CMakeLists.txt b/tdeabc/plugins/file/CMakeLists.txt
index 6c17d2dc7..f5d5e2cdc 100644
--- a/tdeabc/plugins/file/CMakeLists.txt
+++ b/tdeabc/plugins/file/CMakeLists.txt
@@ -11,8 +11,8 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kabc
- ${CMAKE_SOURCE_DIR}/kabc
+ ${CMAKE_BINARY_DIR}/tdeabc
+ ${CMAKE_SOURCE_DIR}/tdeabc
${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/tdecore
@@ -34,12 +34,12 @@ link_directories(
install( FILES
resourcefile.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kabc )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/tdeabc )
##### 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) #######################
diff --git a/tdeabc/plugins/file/Makefile.am b/tdeabc/plugins/file/Makefile.am
index d00ffea3f..bf85d8bd6 100644
--- a/tdeabc/plugins/file/Makefile.am
+++ b/tdeabc/plugins/file/Makefile.am
@@ -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
noinst_HEADERS = resourcefileconfig.h
@@ -19,10 +19,10 @@ kabc_file_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
METASOURCES = AUTO
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
-servicedir = $(kde_servicesdir)/tderesources/kabc
+servicedir = $(kde_servicesdir)/tderesources/tdeabc
service_DATA = file.desktop
diff --git a/tdeabc/plugins/ldaptdeio/CMakeLists.txt b/tdeabc/plugins/ldaptdeio/CMakeLists.txt
index 820f6e017..58e54de0d 100644
--- a/tdeabc/plugins/ldaptdeio/CMakeLists.txt
+++ b/tdeabc/plugins/ldaptdeio/CMakeLists.txt
@@ -11,8 +11,8 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kabc
- ${CMAKE_SOURCE_DIR}/kabc
+ ${CMAKE_BINARY_DIR}/tdeabc
+ ${CMAKE_SOURCE_DIR}/tdeabc
${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/tdecore
@@ -34,12 +34,12 @@ link_directories(
install( FILES
resourceldaptdeio.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kabc )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/tdeabc )
##### other data ################################
-install( FILES ldaptdeio.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc )
+install( FILES ldaptdeio.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc )
##### kabc_ldaptdeio ##############################
diff --git a/tdeabc/plugins/ldaptdeio/Makefile.am b/tdeabc/plugins/ldaptdeio/Makefile.am
index bc81d13d8..9b2fc49a1 100644
--- a/tdeabc/plugins/ldaptdeio/Makefile.am
+++ b/tdeabc/plugins/ldaptdeio/Makefile.am
@@ -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
noinst_HEADERS = resourceldaptdeioconfig.h
@@ -17,12 +17,12 @@ kabc_ldaptdeio_la_LIBADD = libkabc_ldaptdeio.la $(LIB_QT) $(LIB_TDECORE)
METASOURCES = AUTO
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
-servicedir = $(kde_servicesdir)/tderesources/kabc
+servicedir = $(kde_servicesdir)/tderesources/tdeabc
service_DATA = ldaptdeio.desktop
resourceldaptdeioplugin.lo: ../../addressee.h
diff --git a/tdeabc/plugins/net/CMakeLists.txt b/tdeabc/plugins/net/CMakeLists.txt
index cc9564995..d7bcb02e1 100644
--- a/tdeabc/plugins/net/CMakeLists.txt
+++ b/tdeabc/plugins/net/CMakeLists.txt
@@ -11,8 +11,8 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kabc
- ${CMAKE_SOURCE_DIR}/kabc
+ ${CMAKE_BINARY_DIR}/tdeabc
+ ${CMAKE_SOURCE_DIR}/tdeabc
${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/tdecore
@@ -34,12 +34,12 @@ link_directories(
install( FILES
resourcenet.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kabc )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/tdeabc )
##### 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) ########################
diff --git a/tdeabc/plugins/net/Makefile.am b/tdeabc/plugins/net/Makefile.am
index c2ded1b44..ea921ccbd 100644
--- a/tdeabc/plugins/net/Makefile.am
+++ b/tdeabc/plugins/net/Makefile.am
@@ -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
noinst_HEADERS = resourcenetconfig.h
@@ -17,12 +17,12 @@ kabc_net_la_LIBADD = libkabc_net.la
METASOURCES = AUTO
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
-servicedir = $(kde_servicesdir)/tderesources/kabc
+servicedir = $(kde_servicesdir)/tderesources/tdeabc
service_DATA = net.desktop
resourcenetplugin.lo: ../../addressee.h
diff --git a/tdeabc/plugins/sql/Makefile.am b/tdeabc/plugins/sql/Makefile.am
index 3fa3986ce..a504950cc 100644
--- a/tdeabc/plugins/sql/Makefile.am
+++ b/tdeabc/plugins/sql/Makefile.am
@@ -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
noinst_HEADERS = resourcesql.h resourcesqlconfig.h
@@ -13,7 +13,7 @@ kabc_sql_la_LIBADD = ../../libkabc.la ../../../tdeui/libtdeui.la
METASOURCES = AUTO
messages: rc.cpp
- $(XGETTEXT) *.cpp -o $(podir)/kabc_sql.pot
+ $(XGETTEXT) *.cpp -o $(podir)/tdeabc_sql.pot
linkdir = $(kde_datadir)/tderesources/contact
link_DATA = sql.desktop
diff --git a/tdeabc/tests/Makefile.am b/tdeabc/tests/Makefile.am
index 201cf746a..e3ce8fbd9 100644
--- a/tdeabc/tests/Makefile.am
+++ b/tdeabc/tests/Makefile.am
@@ -1,5 +1,5 @@
# 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)/../vcard/include/generated \
-I$(srcdir)/../vcardparser $(all_includes)
diff --git a/tdeabc/vcardparser/CMakeLists.txt b/tdeabc/vcardparser/CMakeLists.txt
index 2c6fa112a..15a2ce5c8 100644
--- a/tdeabc/vcardparser/CMakeLists.txt
+++ b/tdeabc/vcardparser/CMakeLists.txt
@@ -24,7 +24,7 @@ link_directories(
install( FILES
vcard.h vcardline.h vcardparser.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kabc )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/tdeabc )
##### vcards ####################################
diff --git a/tdeabc/vcardparser/Makefile.am b/tdeabc/vcardparser/Makefile.am
index a855c9756..20c6ed45d 100644
--- a/tdeabc/vcardparser/Makefile.am
+++ b/tdeabc/vcardparser/Makefile.am
@@ -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
libvcards_la_SOURCES = vcard.cpp vcardline.cpp vcardparser.cpp
-vcardsincludedir = $(includedir)/kabc
+vcardsincludedir = $(includedir)/tdeabc
vcardsinclude_HEADERS = vcard.h vcardline.h vcardparser.h
check_PROGRAMS = testread testwrite testread2
diff --git a/tderesources/README.design b/tderesources/README.design
index fc31a2078..d1fa62b91 100644
--- a/tderesources/README.design
+++ b/tderesources/README.design
@@ -5,7 +5,7 @@ KDE RESOURCES
-------------
The KDE Resource framework can be used to manage resources of
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.
A resource family represents stores of information of a certain kind
(appointments, contacts). A resource type class represents a way in
diff --git a/tdeui/kdepackages.h b/tdeui/kdepackages.h
index bff540bdb..e4bc551aa 100644
--- a/tdeui/kdepackages.h
+++ b/tdeui/kdepackages.h
@@ -439,7 +439,7 @@ const char * const packages[] = {
"kdepasswd",
"tdepimlibs",
"tdepimlibs/gpgme++",
-"tdepimlibs/kabc",
+"tdepimlibs/tdeabc",
"tdepimlibs/kblog",
"tdepimlibs/kcal",
"tdepimlibs/kldap",
diff --git a/win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro b/win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro
index 421267305..0661d166c 100644
--- a/win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro
+++ b/win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro
@@ -10,7 +10,7 @@ LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX \
$$KDELIBDESTDIR\kdewin32$$KDELIB_SUFFIX
INCLUDEPATH += $(KDELIBS)/interfaces $(KDELIBS)/interfaces/tdetexteditor \
- $(KDELIBS)/kabc
+ $(KDELIBS)/tdeabc
TARGET = tdetexteditor$$KDEBUG
diff --git a/win/pro_files/kdewidgets/kdewidgets.pro b/win/pro_files/kdewidgets/kdewidgets.pro
index 435087785..dbfb3ba4d 100644
--- a/win/pro_files/kdewidgets/kdewidgets.pro
+++ b/win/pro_files/kdewidgets/kdewidgets.pro
@@ -13,7 +13,7 @@ DESTDIR = $$KDELIBDESTDIR/trinity/plugins/designer
LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeio$$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
SOURCES += classpreviews.cpp kdewidgets.cpp