diff options
Diffstat (limited to 'kontact')
| -rw-r--r-- | kontact/TODO | 2 | ||||
| -rw-r--r-- | kontact/plugins/kmail/Makefile.am | 2 | ||||
| -rw-r--r-- | kontact/plugins/korganizer/Makefile.am | 2 | ||||
| -rw-r--r-- | kontact/plugins/newsticker/Makefile.am | 4 | ||||
| -rw-r--r-- | kontact/plugins/specialdates/Makefile.am | 2 | ||||
| -rw-r--r-- | kontact/plugins/summary/Makefile.am | 2 | ||||
| -rw-r--r-- | kontact/src/Makefile.am | 4 |
7 files changed, 9 insertions, 9 deletions
diff --git a/kontact/TODO b/kontact/TODO index 36f34905c..7b39e0730 100644 --- a/kontact/TODO +++ b/kontact/TODO @@ -2,7 +2,7 @@ UNTIL KDE 3.2 ============== - merge config of parts into a unified config dialog - * Unified Identity handling (Name, Mail address, SMTP, use KMIdentity KDEPIM wide?) + * Unified Identity handling (Name, Mail address, SMTP, use KMIdentity TDEPIM wide?) Currently this is dublicated in at least KMail, KNode and KOrganizer * Molularize KOrganizer and KMail Settings and turn them into kcm's * Think about extending the kcm idea and add a framework to locate kcm's for apps via KTrader diff --git a/kontact/plugins/kmail/Makefile.am b/kontact/plugins/kmail/Makefile.am index 5cabde505..2dceb467a 100644 --- a/kontact/plugins/kmail/Makefile.am +++ b/kontact/plugins/kmail/Makefile.am @@ -15,7 +15,7 @@ libkontact_kmailplugin_la_SOURCES = kmail_plugin.cpp kmailIface.stub \ kcm_kmailsummary_la_SOURCES = kcmkmailsummary.cpp kcm_kmailsummary_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \ -avoid-version -no-undefined -kcm_kmailsummary_la_LIBADD = $(LIB_KDEUI) +kcm_kmailsummary_la_LIBADD = $(LIB_TDEUI) kmailIface_DCOPIDLNG = true diff --git a/kontact/plugins/korganizer/Makefile.am b/kontact/plugins/korganizer/Makefile.am index f041fa4ca..fd9ac6312 100644 --- a/kontact/plugins/korganizer/Makefile.am +++ b/kontact/plugins/korganizer/Makefile.am @@ -45,7 +45,7 @@ kcm_korgsummary_la_SOURCES = kcmkorgsummary.cpp kcm_korgsummary_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) \ $(all_libraries) \ -avoid-version -no-undefined -kcm_korgsummary_la_LIBADD = $(LIB_KDEUI) +kcm_korgsummary_la_LIBADD = $(LIB_TDEUI) METASOURCES = AUTO diff --git a/kontact/plugins/newsticker/Makefile.am b/kontact/plugins/newsticker/Makefile.am index d30813342..5c707cf18 100644 --- a/kontact/plugins/newsticker/Makefile.am +++ b/kontact/plugins/newsticker/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces \ kde_module_LTLIBRARIES = libkontact_newstickerplugin.la kcm_kontactknt.la libkontact_newstickerplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libkontact_newstickerplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KDEUI) \ +libkontact_newstickerplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEUI) \ $(top_builddir)/libtdepim/libtdepim.la ../../interfaces/libkpinterfaces.la libkontact_newstickerplugin_la_SOURCES = newsticker_plugin.cpp \ @@ -13,7 +13,7 @@ libkontact_newstickerplugin_la_SOURCES = newsticker_plugin.cpp \ kcm_kontactknt_la_SOURCES = kcmkontactknt.cpp kcm_kontactknt_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \ -avoid-version -no-undefined -kcm_kontactknt_la_LIBADD = $(LIB_KDEUI) +kcm_kontactknt_la_LIBADD = $(LIB_TDEUI) METASOURCES = AUTO diff --git a/kontact/plugins/specialdates/Makefile.am b/kontact/plugins/specialdates/Makefile.am index 7922b79ad..fa202f21e 100644 --- a/kontact/plugins/specialdates/Makefile.am +++ b/kontact/plugins/specialdates/Makefile.am @@ -17,7 +17,7 @@ libkontact_specialdatesplugin_la_SOURCES = specialdates_plugin.cpp \ kcm_sdsummary_la_SOURCES = kcmsdsummary.cpp kcm_sdsummary_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \ -avoid-version -no-undefined -kcm_sdsummary_la_LIBADD = $(LIB_KDEUI) +kcm_sdsummary_la_LIBADD = $(LIB_TDEUI) METASOURCES = AUTO diff --git a/kontact/plugins/summary/Makefile.am b/kontact/plugins/summary/Makefile.am index d2051701a..0886be496 100644 --- a/kontact/plugins/summary/Makefile.am +++ b/kontact/plugins/summary/Makefile.am @@ -13,7 +13,7 @@ libkontact_summaryplugin_la_SOURCES = summaryview_plugin.cpp summaryview_part.cp kcm_kontactsummary_la_SOURCES = kcmkontactsummary.cpp kcm_kontactsummary_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \ -avoid-version -no-undefined -kcm_kontactsummary_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) +kcm_kontactsummary_la_LIBADD = $(LIB_TDEUI) $(LIB_KUTILS) METASOURCES = AUTO diff --git a/kontact/src/Makefile.am b/kontact/src/Makefile.am index 3eb9de10d..082f9f243 100644 --- a/kontact/src/Makefile.am +++ b/kontact/src/Makefile.am @@ -4,13 +4,13 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir) $(all_includes) lib_LTLIBRARIES = libkontact.la libkontact_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0 -libkontact_la_LIBADD = $(LIB_KDECORE) +libkontact_la_LIBADD = $(LIB_TDECORE) libkontact_la_SOURCES = prefs.kcfgc bin_PROGRAMS = kontact kontact_METASOURCES = AUTO -kontact_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kontact_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kontact_LDADD = $(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/kontact/interfaces/libkpinterfaces.la libkontact.la \ $(LIB_KPARTS) $(LIB_KUTILS) $(LIB_KHTML) |