summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kabc/frontend/Makefile.am2
-rw-r--r--kabc/kabc2mutt/Makefile.am2
-rw-r--r--kalarm/Makefile.am2
-rw-r--r--kandy/src/Makefile.am2
-rw-r--r--kode/Makefile.am2
-rw-r--r--kontact/plugins/kaddressbook/Makefile.am2
-rw-r--r--korganizer/Makefile.am2
-rw-r--r--libkcal/Makefile.am2
-rw-r--r--tderesources/carddav/Makefile.am2
-rw-r--r--tderesources/egroupware/Makefile.am2
-rw-r--r--tderesources/groupdav/Makefile.am2
-rw-r--r--tderesources/groupware/Makefile.am2
-rw-r--r--tderesources/groupwise/Makefile.am2
-rw-r--r--tderesources/kolab/tdeabc/Makefile.am2
-rw-r--r--tderesources/newexchange/Makefile.am4
-rw-r--r--tderesources/scalix/tdeabc/Makefile.am2
16 files changed, 17 insertions, 17 deletions
diff --git a/kabc/frontend/Makefile.am b/kabc/frontend/Makefile.am
index da3d8299b..6cec95468 100644
--- a/kabc/frontend/Makefile.am
+++ b/kabc/frontend/Makefile.am
@@ -5,6 +5,6 @@ METASOURCES = AUTO
bin_PROGRAMS = kabcfrontend
kabcfrontend_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kabcfrontend_LDADD = -lkabc $(LIB_TDECORE)
+kabcfrontend_LDADD = -ltdeabc $(LIB_TDECORE)
kabcfrontend_SOURCES = main.cpp mainWindow.ui
diff --git a/kabc/kabc2mutt/Makefile.am b/kabc/kabc2mutt/Makefile.am
index c6643804c..5713ff006 100644
--- a/kabc/kabc2mutt/Makefile.am
+++ b/kabc/kabc2mutt/Makefile.am
@@ -5,7 +5,7 @@ METASOURCES = AUTO
bin_PROGRAMS = kabc2mutt
kabc2mutt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kabc2mutt_LDADD = -lkabc $(LIB_TDECORE)
+kabc2mutt_LDADD = -ltdeabc $(LIB_TDECORE)
kabc2mutt_SOURCES = kabc2mutt.cpp main.cpp
messages: rc.cpp
diff --git a/kalarm/Makefile.am b/kalarm/Makefile.am
index defbcce7f..9f3fb32a8 100644
--- a/kalarm/Makefile.am
+++ b/kalarm/Makefile.am
@@ -31,7 +31,7 @@ kalarm_LDADD = $(top_builddir)/kalarm/lib/libkalarm.la \
$(top_builddir)/kalarm/kalarmd/libkalarmd.la \
$(top_builddir)/libtdepim/libtdepim.la \
$(top_builddir)/libkpimidentities/libkpimidentities.la \
- -lkabc -ltdeutils $(LIB_TDEUI) $(ARTSLIB) $(LIBXTST)
+ -ltdeabc -ltdeutils $(LIB_TDEUI) $(ARTSLIB) $(LIBXTST)
noinst_HEADERS = alarmcalendar.h alarmevent.h alarmlistview.h alarmtext.h \
alarmtimewidget.h birthdaydlg.h daemon.h dcophandler.h deferdlg.h \
editdlg.h editdlgprivate.h emailidcombo.h eventlistviewbase.h find.h \
diff --git a/kandy/src/Makefile.am b/kandy/src/Makefile.am
index 87f3eb8e0..31ba417fd 100644
--- a/kandy/src/Makefile.am
+++ b/kandy/src/Makefile.am
@@ -3,7 +3,7 @@ bin_PROGRAMS = kandy kandy_client
INCLUDES = -I$(top_srcdir) $(all_includes)
kandy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kandy_LDADD = $(KANDY_LIBLOCKDEV) $(LIB_TDEFILE) -lkabc $(top_builddir)/libtdepim/libtdepim.la
+kandy_LDADD = $(KANDY_LIBLOCKDEV) $(LIB_TDEFILE) -ltdeabc $(top_builddir)/libtdepim/libtdepim.la
kandy_SOURCES = main.cpp kandy.cpp \
cmdpropertiesdialog_base.ui cmdpropertiesdialog.cpp \
kandyview.cpp \
diff --git a/kode/Makefile.am b/kode/Makefile.am
index 2303052d8..877a17e94 100644
--- a/kode/Makefile.am
+++ b/kode/Makefile.am
@@ -15,7 +15,7 @@ libkode_la_LIBADD = -ltdecore
bin_PROGRAMS = kode
kode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kode_LDADD = libkode.la -lkabc
+kode_LDADD = libkode.la -ltdeabc
kode_SOURCES = kodemain.cpp
METASOURCES = AUTO
diff --git a/kontact/plugins/kaddressbook/Makefile.am b/kontact/plugins/kaddressbook/Makefile.am
index 8cbe4f4a9..3f814d303 100644
--- a/kontact/plugins/kaddressbook/Makefile.am
+++ b/kontact/plugins/kaddressbook/Makefile.am
@@ -1,7 +1,7 @@
INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir) $(all_includes)
kde_module_LTLIBRARIES = libkontact_kaddressbookplugin.la
-libkontact_kaddressbookplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -lkabc
+libkontact_kaddressbookplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdeabc
libkontact_kaddressbookplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(top_builddir)/libtdepim/libtdepim.la
libkontact_kaddressbookplugin_la_SOURCES = kaddressbook_plugin.cpp \
diff --git a/korganizer/Makefile.am b/korganizer/Makefile.am
index 859213e44..ff334a4d4 100644
--- a/korganizer/Makefile.am
+++ b/korganizer/Makefile.am
@@ -63,7 +63,7 @@ libkorganizer_la_LIBADD = \
$(top_builddir)/libkholidays/libkholidays.la \
$(top_builddir)/libkmime/libkmime.la \
$(LIB_KPARTS) $(LIB_TDEFILE) $(LIB_KNEWSTUFF) \
- -ltdeprint -lkabc -ltdeutils
+ -ltdeprint -ltdeabc -ltdeutils
libkorganizer_la_COMPILE_FIRST = \
kogroupwareprefspage.ui \
diff --git a/libkcal/Makefile.am b/libkcal/Makefile.am
index 75aa7d8aa..3840dd755 100644
--- a/libkcal/Makefile.am
+++ b/libkcal/Makefile.am
@@ -12,7 +12,7 @@ libkcal_la_LIBADD = versit/libversit.la $(LIB_KIO) \
$(top_builddir)/ktnef/lib/libktnef.la \
../libkmime/libkmime.la \
../libemailfunctions/libemailfunctions.la \
- -ltderesources -lkabc
+ -ltderesources -ltdeabc
libkcal_la_SOURCES = \
assignmentvisitor.cpp comparisonvisitor.cpp \
diff --git a/tderesources/carddav/Makefile.am b/tderesources/carddav/Makefile.am
index ff63306dc..446f51e00 100644
--- a/tderesources/carddav/Makefile.am
+++ b/tderesources/carddav/Makefile.am
@@ -15,7 +15,7 @@ libtdeabc_carddav_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \
libtdeabc_carddav_la_LIBADD = \
$(top_builddir)/libtdepim/libtdepim.la \
$(top_builddir)/libkcal/libkcal.la \
- -lkabc \
+ -ltdeabc \
-lcarddav
libtdeabc_carddav_la_COMPILE_FIRST = prefsskel.h
diff --git a/tderesources/egroupware/Makefile.am b/tderesources/egroupware/Makefile.am
index c76442b79..644b68a34 100644
--- a/tderesources/egroupware/Makefile.am
+++ b/tderesources/egroupware/Makefile.am
@@ -20,7 +20,7 @@ lib_LTLIBRARIES = libtdeabc_xmlrpc.la libkcal_xmlrpc.la libknotes_xmlrpc.la
libtdeabc_xmlrpc_la_SOURCES = tdeabc_resourcexmlrpc.cpp tdeabc_resourcexmlrpcconfig.cpp \
tdeabc_egroupwareprefs.kcfgc
libtdeabc_xmlrpc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
-libtdeabc_xmlrpc_la_LIBADD = $(LIB_KIO) -lkabc $(top_builddir)/libtdepim/libtdepim.la \
+libtdeabc_xmlrpc_la_LIBADD = $(LIB_KIO) -ltdeabc $(top_builddir)/libtdepim/libtdepim.la \
$(top_builddir)/kaddressbook/common/libkabcommon.la \
libegwcommon.la
diff --git a/tderesources/groupdav/Makefile.am b/tderesources/groupdav/Makefile.am
index 1511e4f66..a2b56e36a 100644
--- a/tderesources/groupdav/Makefile.am
+++ b/tderesources/groupdav/Makefile.am
@@ -19,7 +19,7 @@ libtdeabc_groupdav_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \
libtdeabc_groupdav_la_LIBADD = \
libkgroupdav.la ../lib/libkgroupwaredav.la \
$(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la \
- -lkabc
+ -ltdeabc
kde_module_LTLIBRARIES = kcal_groupdav.la tdeabc_groupdav.la
diff --git a/tderesources/groupware/Makefile.am b/tderesources/groupware/Makefile.am
index 38f5083dc..8924cde35 100644
--- a/tderesources/groupware/Makefile.am
+++ b/tderesources/groupware/Makefile.am
@@ -18,7 +18,7 @@ libtdeabc_groupware_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \
-version-info 1:0:0 -no-undefined
libtdeabc_groupware_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/libtdepim/libtdepim.la \
- -lkabc
+ -ltdeabc
kde_module_LTLIBRARIES = kcal_groupware.la tdeabc_groupware.la
diff --git a/tderesources/groupwise/Makefile.am b/tderesources/groupwise/Makefile.am
index c098935db..7687215a9 100644
--- a/tderesources/groupwise/Makefile.am
+++ b/tderesources/groupwise/Makefile.am
@@ -21,7 +21,7 @@ libtdeabc_groupwise_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \
libtdeabc_groupwise_la_LIBADD = soap/libgwsoap.la \
$(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/libtdepim/libtdepim.la \
- -lkabc
+ -ltdeabc
kde_module_LTLIBRARIES = kcal_groupwise.la tdeabc_groupwise.la
diff --git a/tderesources/kolab/tdeabc/Makefile.am b/tderesources/kolab/tdeabc/Makefile.am
index 7b552e903..e750d5464 100644
--- a/tderesources/kolab/tdeabc/Makefile.am
+++ b/tderesources/kolab/tdeabc/Makefile.am
@@ -9,7 +9,7 @@ libkabckolab_la_SOURCES = resourcekolab.cpp contact.cpp
libkabckolab_la_LDFLAGS = $(all_libraries) -no-undefined
libkabckolab_la_LIBADD = \
$(top_builddir)/tderesources/kolab/shared/libresourcekolabshared.la \
- -ltderesources -lkabc
+ -ltderesources -ltdeabc
kde_module_LTLIBRARIES = tdeabc_kolab.la
diff --git a/tderesources/newexchange/Makefile.am b/tderesources/newexchange/Makefile.am
index f5f9191bd..305e6146c 100644
--- a/tderesources/newexchange/Makefile.am
+++ b/tderesources/newexchange/Makefile.am
@@ -12,7 +12,7 @@ libkcal_newexchange_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \
libkcal_newexchange_la_LIBADD = \
libknewexchange.la ../lib/libkgroupwaredav.la \
$(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la \
- -lkabc
+ -ltdeabc
libtdeabc_newexchange_la_SOURCES = tdeabc_resourceexchange.cpp exchangeaddressbookadaptor.cpp
libtdeabc_newexchange_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \
@@ -20,7 +20,7 @@ libtdeabc_newexchange_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \
libtdeabc_newexchange_la_LIBADD = \
libknewexchange.la ../lib/libkgroupwaredav.la \
$(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la \
- -lkabc
+ -ltdeabc
kde_module_LTLIBRARIES = kcal_newexchange.la tdeabc_newexchange.la
diff --git a/tderesources/scalix/tdeabc/Makefile.am b/tderesources/scalix/tdeabc/Makefile.am
index e8bbc3bbc..88cf96d14 100644
--- a/tderesources/scalix/tdeabc/Makefile.am
+++ b/tderesources/scalix/tdeabc/Makefile.am
@@ -9,7 +9,7 @@ libkabcscalix_la_SOURCES = resourcescalix.cpp contact.cpp
libkabcscalix_la_LDFLAGS = $(all_libraries) -no-undefined
libkabcscalix_la_LIBADD = \
$(top_builddir)/tderesources/scalix/shared/libresourcescalixshared.la \
- -ltderesources -lkabc
+ -ltderesources -ltdeabc
kde_module_LTLIBRARIES = tdeabc_scalix.la