From 865f314dd5ed55508f45a32973b709b79a541e36 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 11 Dec 2009 03:46:01 +0000 Subject: kdelibs update to Trinity v3.5.11 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1061230 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kabc/Makefile.am | 2 +- kabc/formats/Makefile.am | 2 +- kabc/plugins/dir/Makefile.am | 4 ++-- kabc/plugins/file/Makefile.am | 4 ++-- kabc/plugins/ldapkio/Makefile.am | 4 ++-- kabc/vcard/Makefile.am | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) (limited to 'kabc') diff --git a/kabc/Makefile.am b/kabc/Makefile.am index b41946f34..7ca9bd473 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 + $(top_builddir)/kresources/libkresources.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDEUI) $(LIB_KDECORE) libkabc_la_COMPILE_FIRST = addressee.h libkabc_la_SOURCES = \ diff --git a/kabc/formats/Makefile.am b/kabc/formats/Makefile.am index 5de6d6485..0b5978b20 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 = $(top_builddir)/kabc/libkabc.la +kabcformat_binary_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(LIB_KDECORE) 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 bf07e6af3..d06588266 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) +libkabc_dir_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_KDECORE) $(LIB_KFILE) $(LIB_KDEUI) 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 +kabc_dir_la_LIBADD = libkabc_dir.la $(LIB_QT) $(LIB_KDECORE) METASOURCES = AUTO diff --git a/kabc/plugins/file/Makefile.am b/kabc/plugins/file/Makefile.am index 9e3fc8360..2edbfe9c7 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) +libkabc_file_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_KFILE) $(LIB_KDECORE) $(LIB_KDEUI) 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 +kabc_file_la_LIBADD = libkabc_file.la $(LIB_QT) $(LIB_KDECORE) 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 64a72b8f2..1198070c9 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 = $(top_builddir)/kabc/libkabc.la $(LIB_KIO) +libkabc_ldapkio_la_LIBADD = $(LIB_KABC) $(LIB_KIO) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_KDEUI) $(LIB_KDECORE) 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 +kabc_ldapkio_la_LIBADD = libkabc_ldapkio.la $(LIB_QT) $(LIB_KDECORE) METASOURCES = AUTO diff --git a/kabc/vcard/Makefile.am b/kabc/vcard/Makefile.am index 86306fece..953857161 100644 --- a/kabc/vcard/Makefile.am +++ b/kabc/vcard/Makefile.am @@ -8,7 +8,7 @@ lib_LTLIBRARIES = libvcard.la libvcard_la_SOURCES = vCard-all.cpp libvcard_la_LDFLAGS = $(all_libraries) -libvcard_la_LIBADD = $(LIB_KDECORE) +libvcard_la_LIBADD = $(LIB_KDECORE) $(LIB_QT) check_PROGRAMS = testwrite testread -- cgit v1.2.1