diff options
Diffstat (limited to 'kabc')
-rw-r--r-- | kabc/CMakeLists.txt | 6 | ||||
-rw-r--r-- | kabc/Makefile.am | 4 | ||||
-rw-r--r-- | kabc/formats/CMakeLists.txt | 4 | ||||
-rw-r--r-- | kabc/plugins/dir/CMakeLists.txt | 6 | ||||
-rw-r--r-- | kabc/plugins/evolution/Makefile.am | 2 | ||||
-rw-r--r-- | kabc/plugins/file/CMakeLists.txt | 6 | ||||
-rw-r--r-- | kabc/plugins/ldapkio/CMakeLists.txt | 6 | ||||
-rw-r--r-- | kabc/plugins/net/CMakeLists.txt | 6 | ||||
-rw-r--r-- | kabc/plugins/net/Makefile.am | 2 | ||||
-rw-r--r-- | kabc/plugins/sql/Makefile.am | 2 | ||||
-rw-r--r-- | kabc/tests/Makefile.am | 24 | ||||
-rw-r--r-- | kabc/vcard/CMakeLists.txt | 6 | ||||
-rw-r--r-- | kabc/vcard/Makefile.am | 4 | ||||
-rw-r--r-- | kabc/vcardparser/CMakeLists.txt | 4 | ||||
-rw-r--r-- | kabc/vcardparser/Makefile.am | 6 |
15 files changed, 44 insertions, 44 deletions
diff --git a/kabc/CMakeLists.txt b/kabc/CMakeLists.txt index 1db5f73c9..3cca65863 100644 --- a/kabc/CMakeLists.txt +++ b/kabc/CMakeLists.txt @@ -24,11 +24,11 @@ include_directories( # external includes ${TQT_INCLUDE_DIRS} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kab diff --git a/kabc/Makefile.am b/kabc/Makefile.am index 52b8bcb48..76e37e2b0 100644 --- a/kabc/Makefile.am +++ b/kabc/Makefile.am @@ -52,7 +52,7 @@ METASOURCES = AUTO bin_PROGRAMS = kab2kabc -kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kab2kabc_LDADD = libkabc.la ../kab/libkab.la kab2kabc_SOURCES = kab2kabc.cpp @@ -62,7 +62,7 @@ autostartdir = $(datadir)/autostart manager_DATA = kabc_manager.desktop managerdir = $(kde_servicesdir)/kresources -DOXYGEN_REFERENCES = kdecore kdeui +DOXYGEN_REFERENCES = tdecore tdeui map_DATA = countrytransl.map mapdir = $(kde_datadir)/kabc diff --git a/kabc/formats/CMakeLists.txt b/kabc/formats/CMakeLists.txt index 47ad9f37a..327cb1ea6 100644 --- a/kabc/formats/CMakeLists.txt +++ b/kabc/formats/CMakeLists.txt @@ -14,10 +14,10 @@ include_directories( ${CMAKE_SOURCE_DIR}/kabc ${TQT_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ) diff --git a/kabc/plugins/dir/CMakeLists.txt b/kabc/plugins/dir/CMakeLists.txt index f25967dc8..1bc7d8daf 100644 --- a/kabc/plugins/dir/CMakeLists.txt +++ b/kabc/plugins/dir/CMakeLists.txt @@ -15,11 +15,11 @@ include_directories( ${CMAKE_SOURCE_DIR}/kabc ${TQT_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kfile diff --git a/kabc/plugins/evolution/Makefile.am b/kabc/plugins/evolution/Makefile.am index 0ffc7e18d..5967b9433 100644 --- a/kabc/plugins/evolution/Makefile.am +++ b/kabc/plugins/evolution/Makefile.am @@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = kabc_evo.la kabc_evo_la_SOURCES = dbwrapper.cpp resourceevo.cpp kabc_evo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -kabc_evo_la_LIBADD = ../../../kabc/libkabc.la ../../../kdeui/libtdeui.la -ldb ../../../kabc/vcardparser/libvcards.la +kabc_evo_la_LIBADD = ../../../kabc/libkabc.la ../../../tdeui/libtdeui.la -ldb ../../../kabc/vcardparser/libvcards.la METASOURCES = AUTO diff --git a/kabc/plugins/file/CMakeLists.txt b/kabc/plugins/file/CMakeLists.txt index e3a0fc3ae..0c767b00d 100644 --- a/kabc/plugins/file/CMakeLists.txt +++ b/kabc/plugins/file/CMakeLists.txt @@ -15,11 +15,11 @@ include_directories( ${CMAKE_SOURCE_DIR}/kabc ${TQT_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kfile diff --git a/kabc/plugins/ldapkio/CMakeLists.txt b/kabc/plugins/ldapkio/CMakeLists.txt index b0e2b0d07..57370c9cf 100644 --- a/kabc/plugins/ldapkio/CMakeLists.txt +++ b/kabc/plugins/ldapkio/CMakeLists.txt @@ -15,11 +15,11 @@ include_directories( ${CMAKE_SOURCE_DIR}/kabc ${TQT_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kfiles diff --git a/kabc/plugins/net/CMakeLists.txt b/kabc/plugins/net/CMakeLists.txt index e7336f1ff..5433af217 100644 --- a/kabc/plugins/net/CMakeLists.txt +++ b/kabc/plugins/net/CMakeLists.txt @@ -15,11 +15,11 @@ include_directories( ${CMAKE_SOURCE_DIR}/kabc ${TQT_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kfile diff --git a/kabc/plugins/net/Makefile.am b/kabc/plugins/net/Makefile.am index 1998296a7..f4183d442 100644 --- a/kabc/plugins/net/Makefile.am +++ b/kabc/plugins/net/Makefile.am @@ -11,7 +11,7 @@ libkabc_net_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h kde_module_LTLIBRARIES = kabc_net.la kabc_net_la_SOURCES = resourcenetplugin.cpp -kabc_net_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -L../../../kdecore/.libs/ -lkdecore +kabc_net_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -L../../../tdecore/.libs/ -ltdecore kabc_net_la_LIBADD = libkabc_net.la METASOURCES = AUTO diff --git a/kabc/plugins/sql/Makefile.am b/kabc/plugins/sql/Makefile.am index 810938683..6d638936f 100644 --- a/kabc/plugins/sql/Makefile.am +++ b/kabc/plugins/sql/Makefile.am @@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = kabc_sql.la kabc_sql_la_SOURCES = resourcesql.cpp resourcesqlconfig.cpp kabc_sql_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -kabc_sql_la_LIBADD = ../../libkabc.la ../../../kdeui/libtdeui.la +kabc_sql_la_LIBADD = ../../libkabc.la ../../../tdeui/libtdeui.la METASOURCES = AUTO diff --git a/kabc/tests/Makefile.am b/kabc/tests/Makefile.am index 12651b8f0..3c40ccb63 100644 --- a/kabc/tests/Makefile.am +++ b/kabc/tests/Makefile.am @@ -12,44 +12,44 @@ check_PROGRAMS = testlock testldapclient testlock_LDFLAGS = $(all_libraries) testlock_SOURCES = testlock.cpp -testldapclient_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testldapclient_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testldapclient_SOURCES = testldapclient.cpp EXTRA_PROGRAMS = testkabc testkabcdlg testdistlist bigread bigwrite testdb \ testaddressee testaddresseelist testaddressfmt kabcargl testaddresslineedit -testkabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testkabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testkabc_SOURCES = testkabc.cpp -testaddressee_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testaddressee_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testaddressee_SOURCES = testaddressee.cpp -testaddresseelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testaddresseelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testaddresseelist_SOURCES = testaddresseelist.cpp -testaddressfmt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testaddressfmt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testaddressfmt_SOURCES = testaddressfmt.cpp -testkabcdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testkabcdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testkabcdlg_SOURCES = testkabcdlg.cpp -testdistlist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testdistlist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testdistlist_SOURCES = testdistlist.cpp -testaddresslineedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testaddresslineedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testaddresslineedit_SOURCES = testaddresslineedit.cpp -bigread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +bigread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor bigread_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la bigread_SOURCES = bigread.cpp -bigwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +bigwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor bigwrite_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la bigwrite_SOURCES = bigwrite.cpp -testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testdb_SOURCES = testdb.cpp -kabcargl_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kabcargl_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kabcargl_SOURCES = kabcargl.cpp diff --git a/kabc/vcard/CMakeLists.txt b/kabc/vcard/CMakeLists.txt index f2ac63bac..8ad988434 100644 --- a/kabc/vcard/CMakeLists.txt +++ b/kabc/vcard/CMakeLists.txt @@ -15,8 +15,8 @@ include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/include/generated - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore ) link_directories( @@ -35,6 +35,6 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED SOURCES ${${target}_SRCS} VERSION 0.0.0 - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kabc/vcard/Makefile.am b/kabc/vcard/Makefile.am index 20d9b640e..94d08e292 100644 --- a/kabc/vcard/Makefile.am +++ b/kabc/vcard/Makefile.am @@ -12,10 +12,10 @@ libvcard_la_LIBADD = $(LIB_KDECORE) $(LIB_QT) check_PROGRAMS = testwrite testread -testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testwrite_LDADD = libvcard.la testwrite_SOURCES = testwrite.cpp -testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testread_LDADD = libvcard.la testread_SOURCES = testread.cpp diff --git a/kabc/vcardparser/CMakeLists.txt b/kabc/vcardparser/CMakeLists.txt index e68bd8fb1..2c6fa112a 100644 --- a/kabc/vcardparser/CMakeLists.txt +++ b/kabc/vcardparser/CMakeLists.txt @@ -11,8 +11,8 @@ include_directories( ${TQT_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore ) link_directories( diff --git a/kabc/vcardparser/Makefile.am b/kabc/vcardparser/Makefile.am index 0b30120cd..5978a8f38 100644 --- a/kabc/vcardparser/Makefile.am +++ b/kabc/vcardparser/Makefile.am @@ -8,15 +8,15 @@ vcardsinclude_HEADERS = vcard.h vcardline.h vcardparser.h check_PROGRAMS = testread testwrite testread2 -testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testread_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la testread_SOURCES = testread.cpp -testread2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testread2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testread2_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la testread2_SOURCES = testread2.cpp testutils.cpp -testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testwrite_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la testwrite_SOURCES = testwrite.cpp |