diff options
Diffstat (limited to 'kabc')
-rw-r--r-- | kabc/Makefile.am | 4 | ||||
-rw-r--r-- | kabc/formats/Makefile.am | 2 | ||||
-rw-r--r-- | kabc/plugins/dir/Makefile.am | 4 | ||||
-rw-r--r-- | kabc/plugins/file/Makefile.am | 4 | ||||
-rw-r--r-- | kabc/plugins/ldapkio/Makefile.am | 4 | ||||
-rw-r--r-- | kabc/tests/Makefile.am | 24 | ||||
-rw-r--r-- | kabc/vcard/Makefile.am | 6 | ||||
-rw-r--r-- | kabc/vcardparser/Makefile.am | 6 |
8 files changed, 27 insertions, 27 deletions
diff --git a/kabc/Makefile.am b/kabc/Makefile.am index 76e37e2b0..c4aa489e7 100644 --- a/kabc/Makefile.am +++ b/kabc/Makefile.am @@ -22,7 +22,7 @@ CLEANFILES = addressee.h addressee.cpp field.cpp lib_LTLIBRARIES = libkabc.la libkabc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 3:0:2 -no-undefined libkabc_la_LIBADD = vcard/libvcard.la vcardparser/libvcards.la $(LIB_KIO) \ - $(top_builddir)/kresources/libkresources.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDEUI) $(LIB_KDECORE) + $(top_builddir)/kresources/libkresources.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE) libkabc_la_COMPILE_FIRST = addressee.h libkabc_la_SOURCES = \ @@ -52,7 +52,7 @@ METASOURCES = AUTO bin_PROGRAMS = kab2kabc -kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kab2kabc_LDADD = libkabc.la ../kab/libkab.la kab2kabc_SOURCES = kab2kabc.cpp diff --git a/kabc/formats/Makefile.am b/kabc/formats/Makefile.am index 0b5978b20..57c2caaa3 100644 --- a/kabc/formats/Makefile.am +++ b/kabc/formats/Makefile.am @@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kabcformat_binary.la kabcformat_binary_la_SOURCES = binaryformat.cpp kabcformat_binary_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \ -no-undefined -kabcformat_binary_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(LIB_KDECORE) +kabcformat_binary_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(LIB_TDECORE) kabcformat_binary_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h # these are the headers for your project diff --git a/kabc/plugins/dir/Makefile.am b/kabc/plugins/dir/Makefile.am index d06588266..f5c0c2523 100644 --- a/kabc/plugins/dir/Makefile.am +++ b/kabc/plugins/dir/Makefile.am @@ -6,13 +6,13 @@ noinst_HEADERS = resourcedirconfig.h lib_LTLIBRARIES = libkabc_dir.la libkabc_dir_la_SOURCES = resourcedir.cpp resourcedirconfig.cpp libkabc_dir_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined -libkabc_dir_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_KDECORE) $(LIB_KFILE) $(LIB_KDEUI) +libkabc_dir_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI) libkabc_dir_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h kde_module_LTLIBRARIES = kabc_dir.la kabc_dir_la_SOURCES = resourcedirplugin.cpp kabc_dir_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined -kabc_dir_la_LIBADD = libkabc_dir.la $(LIB_QT) $(LIB_KDECORE) +kabc_dir_la_LIBADD = libkabc_dir.la $(LIB_QT) $(LIB_TDECORE) METASOURCES = AUTO diff --git a/kabc/plugins/file/Makefile.am b/kabc/plugins/file/Makefile.am index 2edbfe9c7..3060bfab5 100644 --- a/kabc/plugins/file/Makefile.am +++ b/kabc/plugins/file/Makefile.am @@ -6,14 +6,14 @@ noinst_HEADERS = resourcefileconfig.h lib_LTLIBRARIES = libkabc_file.la libkabc_file_la_SOURCES = resourcefile.cpp resourcefileconfig.cpp libkabc_file_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined -libkabc_file_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_KFILE) $(LIB_KDECORE) $(LIB_KDEUI) +libkabc_file_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_KFILE) $(LIB_TDECORE) $(LIB_TDEUI) libkabc_file_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h kde_module_LTLIBRARIES = kabc_file.la kabc_file_la_SOURCES = resourcefileplugin.cpp kabc_file_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined -kabc_file_la_LIBADD = libkabc_file.la $(LIB_QT) $(LIB_KDECORE) +kabc_file_la_LIBADD = libkabc_file.la $(LIB_QT) $(LIB_TDECORE) kabc_file_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h METASOURCES = AUTO diff --git a/kabc/plugins/ldapkio/Makefile.am b/kabc/plugins/ldapkio/Makefile.am index 1198070c9..97cd9089c 100644 --- a/kabc/plugins/ldapkio/Makefile.am +++ b/kabc/plugins/ldapkio/Makefile.am @@ -6,13 +6,13 @@ noinst_HEADERS = resourceldapkioconfig.h lib_LTLIBRARIES = libkabc_ldapkio.la libkabc_ldapkio_la_SOURCES = resourceldapkio.cpp resourceldapkioconfig.cpp libkabc_ldapkio_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined -libkabc_ldapkio_la_LIBADD = $(LIB_KABC) $(LIB_KIO) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_KDEUI) $(LIB_KDECORE) +libkabc_ldapkio_la_LIBADD = $(LIB_KABC) $(LIB_KIO) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_TDEUI) $(LIB_TDECORE) libkabc_ldapkio_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h kde_module_LTLIBRARIES = kabc_ldapkio.la kabc_ldapkio_la_SOURCES = resourceldapkioplugin.cpp kabc_ldapkio_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -kabc_ldapkio_la_LIBADD = libkabc_ldapkio.la $(LIB_QT) $(LIB_KDECORE) +kabc_ldapkio_la_LIBADD = libkabc_ldapkio.la $(LIB_QT) $(LIB_TDECORE) METASOURCES = AUTO diff --git a/kabc/tests/Makefile.am b/kabc/tests/Makefile.am index 3c40ccb63..3af688026 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) -ltdefx $(LIB_KIO) -lktexteditor +testldapclient_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -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) -ltdefx $(LIB_KIO) -lktexteditor +testkabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor testkabc_SOURCES = testkabc.cpp -testaddressee_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testaddressee_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor testaddressee_SOURCES = testaddressee.cpp -testaddresseelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testaddresseelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor testaddresseelist_SOURCES = testaddresseelist.cpp -testaddressfmt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testaddressfmt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor testaddressfmt_SOURCES = testaddressfmt.cpp -testkabcdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testkabcdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor testkabcdlg_SOURCES = testkabcdlg.cpp -testdistlist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testdistlist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor testdistlist_SOURCES = testdistlist.cpp -testaddresslineedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testaddresslineedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor testaddresslineedit_SOURCES = testaddresslineedit.cpp -bigread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +bigread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -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) -ltdefx $(LIB_KIO) -lktexteditor +bigwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -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) -ltdefx $(LIB_KIO) -lktexteditor +testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor testdb_SOURCES = testdb.cpp -kabcargl_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kabcargl_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kabcargl_SOURCES = kabcargl.cpp diff --git a/kabc/vcard/Makefile.am b/kabc/vcard/Makefile.am index 94d08e292..738faff03 100644 --- a/kabc/vcard/Makefile.am +++ b/kabc/vcard/Makefile.am @@ -8,14 +8,14 @@ lib_LTLIBRARIES = libvcard.la libvcard_la_SOURCES = vCard-all.cpp libvcard_la_LDFLAGS = $(all_libraries) -libvcard_la_LIBADD = $(LIB_KDECORE) $(LIB_QT) +libvcard_la_LIBADD = $(LIB_TDECORE) $(LIB_QT) check_PROGRAMS = testwrite testread -testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -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) -ltdefx $(LIB_KIO) -lktexteditor +testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor testread_LDADD = libvcard.la testread_SOURCES = testread.cpp diff --git a/kabc/vcardparser/Makefile.am b/kabc/vcardparser/Makefile.am index 5978a8f38..e698c687a 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) -ltdefx $(LIB_KIO) -lktexteditor +testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -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) -ltdefx $(LIB_KIO) -lktexteditor +testread2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -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) -ltdefx $(LIB_KIO) -lktexteditor +testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor testwrite_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la testwrite_SOURCES = testwrite.cpp |