diff options
Diffstat (limited to 'kicker')
-rw-r--r-- | kicker/applets/launcher/Makefile.am | 4 | ||||
-rw-r--r-- | kicker/applets/lockout/Makefile.am | 2 | ||||
-rw-r--r-- | kicker/applets/media/Makefile.am | 2 | ||||
-rw-r--r-- | kicker/applets/run/Makefile.am | 2 | ||||
-rw-r--r-- | kicker/applets/swallow/Makefile.am | 2 | ||||
-rw-r--r-- | kicker/applets/systemtray/Makefile.am | 2 | ||||
-rw-r--r-- | kicker/applets/trash/Makefile.am | 2 | ||||
-rw-r--r-- | kicker/extensions/kasbar/Makefile.am | 2 | ||||
-rw-r--r-- | kicker/extensions/sidebar/Makefile.am | 2 | ||||
-rw-r--r-- | kicker/extensions/taskbar/Makefile.am | 2 | ||||
-rw-r--r-- | kicker/kicker/Makefile.am | 2 | ||||
-rw-r--r-- | kicker/kicker/plugins/Makefile.am | 2 | ||||
-rw-r--r-- | kicker/libkicker/Makefile.am | 2 | ||||
-rw-r--r-- | kicker/libkicker/kickerSettings.kcfg | 2 | ||||
-rw-r--r-- | kicker/menuext/konq-profiles/Makefile.am | 2 | ||||
-rw-r--r-- | kicker/menuext/konsole/Makefile.am | 2 | ||||
-rw-r--r-- | kicker/menuext/recentdocs/Makefile.am | 2 | ||||
-rw-r--r-- | kicker/menuext/system/Makefile.am | 2 | ||||
-rw-r--r-- | kicker/menuext/tdeprint/Makefile.am | 2 | ||||
-rw-r--r-- | kicker/proxy/Makefile.am | 2 | ||||
-rw-r--r-- | kicker/taskbar/Makefile.am | 2 |
21 files changed, 22 insertions, 22 deletions
diff --git a/kicker/applets/launcher/Makefile.am b/kicker/applets/launcher/Makefile.am index a0384df4f..2ec80e115 100644 --- a/kicker/applets/launcher/Makefile.am +++ b/kicker/applets/launcher/Makefile.am @@ -15,8 +15,8 @@ EXTRA_DIST = $(lnk_DATA) launcher_panelapplet_la_LDFLAGS = -module $(KDE_RPATH) $(all_libraries) -avoid-version -no-undefined launcher_panelapplet_la_LIBADD = ../../kicker/core/libkicker_core.la ../../kicker/buttons/libkicker_buttons.la \ - ../../kicker/ui/libkicker_ui.la ../../libkicker/libkickermain.la $(LIB_KIO) \ - $(LIB_KSYCOCA) $(LIB_TDEUI) $(LIB_KUTILS) + ../../kicker/ui/libkicker_ui.la ../../libkicker/libkickermain.la $(LIB_TDEIO) \ + $(LIB_TDESYCOCA) $(LIB_TDEUI) $(LIB_TDEUTILS) kde_kcfg_DATA = launcherapplet.kcfg diff --git a/kicker/applets/lockout/Makefile.am b/kicker/applets/lockout/Makefile.am index f9772adf5..7f0c11ac6 100644 --- a/kicker/applets/lockout/Makefile.am +++ b/kicker/applets/lockout/Makefile.am @@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = lockout_panelapplet.la lockout_panelapplet_la_SOURCES = lockout.cpp lockout_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lockout_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_KSYCOCA) +lockout_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_TDESYCOCA) noinst_HEADERS = lockout.h diff --git a/kicker/applets/media/Makefile.am b/kicker/applets/media/Makefile.am index f7d5dbee4..b7b717628 100644 --- a/kicker/applets/media/Makefile.am +++ b/kicker/applets/media/Makefile.am @@ -13,7 +13,7 @@ lnk_DATA = mediaapplet.desktop EXTRA_DIST = $(lnk_DATA) media_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -media_panelapplet_la_LIBADD = ../../../libkonq/libkonq.la ../../libkicker/libkickermain.la $(LIB_TDEUI) $(LIB_KIO) $(LIB_KUTILS) +media_panelapplet_la_LIBADD = ../../../libkonq/libkonq.la ../../libkicker/libkickermain.la $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEUTILS) messages: rc.cpp $(XGETTEXT) *.cpp *.h -o $(podir)/mediaapplet.pot diff --git a/kicker/applets/run/Makefile.am b/kicker/applets/run/Makefile.am index a14c2353a..70885a6a9 100644 --- a/kicker/applets/run/Makefile.am +++ b/kicker/applets/run/Makefile.am @@ -13,7 +13,7 @@ lnk_DATA = runapplet.desktop EXTRA_DIST = $(lnk_DATA) run_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -run_panelapplet_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI) +run_panelapplet_la_LIBADD = $(LIB_TDESYCOCA) $(LIB_TDEUI) messages: $(XGETTEXT) *.cpp *.h -o $(podir)/krunapplet.pot diff --git a/kicker/applets/swallow/Makefile.am b/kicker/applets/swallow/Makefile.am index 78d70c2d3..ba4d1b916 100644 --- a/kicker/applets/swallow/Makefile.am +++ b/kicker/applets/swallow/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = swallow_panelapplet.la swallow_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -swallow_panelapplet_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) +swallow_panelapplet_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO) swallow_panelapplet_la_SOURCES = swallow.cpp prefwidgetbase.ui prefwidget.cpp diff --git a/kicker/applets/systemtray/Makefile.am b/kicker/applets/systemtray/Makefile.am index 3ba76ca5c..96fba41de 100644 --- a/kicker/applets/systemtray/Makefile.am +++ b/kicker/applets/systemtray/Makefile.am @@ -14,7 +14,7 @@ lnk_DATA = systemtrayapplet.desktop EXTRA_DIST = $(lnk_DATA) systemtray_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -systemtray_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_TDEUI) $(LIB_KIO) +systemtray_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_TDEUI) $(LIB_TDEIO) messages: diff --git a/kicker/applets/trash/Makefile.am b/kicker/applets/trash/Makefile.am index 2da7fec68..602462a37 100644 --- a/kicker/applets/trash/Makefile.am +++ b/kicker/applets/trash/Makefile.am @@ -14,7 +14,7 @@ lnk_DATA = trashapplet.desktop EXTRA_DIST = $(lnk_DATA) trash_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -trash_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la ../../../libkonq/libkonq.la $(LIB_TDEUI) $(LIB_KIO) $(LIB_KUTILS) +trash_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la ../../../libkonq/libkonq.la $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEUTILS) messages: rc.cpp $(XGETTEXT) *.cpp *.h -o $(podir)/trashapplet.pot diff --git a/kicker/extensions/kasbar/Makefile.am b/kicker/extensions/kasbar/Makefile.am index e186aad17..a0d79970f 100644 --- a/kicker/extensions/kasbar/Makefile.am +++ b/kicker/extensions/kasbar/Makefile.am @@ -37,7 +37,7 @@ EXTRA_DIST = $(lnk_DATA) bin_PROGRAMS = kasbar kasbar_SOURCES = kasbarapp.cpp -kasbar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kasbar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kasbar_LDADD = libkasbar.la \ $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) diff --git a/kicker/extensions/sidebar/Makefile.am b/kicker/extensions/sidebar/Makefile.am index 0da0a7052..9d0b75eec 100644 --- a/kicker/extensions/sidebar/Makefile.am +++ b/kicker/extensions/sidebar/Makefile.am @@ -6,7 +6,7 @@ sidebar_panelextension_la_SOURCES = sidebarextension.cpp sidebar_panelextension_la_METASOURCES = AUTO sidebar_panelextension_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -sidebar_panelextension_la_LIBADD = $(LIB_TDEUI) $(LIB_KPARTS) ../../../libkonq/libkonq.la +sidebar_panelextension_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEPARTS) ../../../libkonq/libkonq.la lnkdir = $(kde_datadir)/kicker/extensions diff --git a/kicker/extensions/taskbar/Makefile.am b/kicker/extensions/taskbar/Makefile.am index d4752e321..72dbcee7a 100644 --- a/kicker/extensions/taskbar/Makefile.am +++ b/kicker/extensions/taskbar/Makefile.am @@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = taskbar_panelextension.la taskbar_panelextension_la_SOURCES = taskbarextension.cpp taskbarextension.skel taskbar_panelextension_la_METASOURCES = AUTO taskbar_panelextension_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -taskbar_panelextension_la_LIBADD = $(LIB_TDEUI) $(LIB_KPARTS) \ +taskbar_panelextension_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEPARTS) \ ../../libkicker/libkickermain.la \ ../../taskmanager/libtaskmanager.la \ ../../taskbar/libtaskbar.la diff --git a/kicker/kicker/Makefile.am b/kicker/kicker/Makefile.am index 7f3d0b275..b3026b5ee 100644 --- a/kicker/kicker/Makefile.am +++ b/kicker/kicker/Makefile.am @@ -10,7 +10,7 @@ tdeinit_LTLIBRARIES = kicker.la CLEANFILES = dummy.cpp kicker_la_LIBADD = core/libkicker_core.la buttons/libkicker_buttons.la \ - ui/libkicker_ui.la ../libkicker/libkickermain.la $(LIB_KIO) $(LIB_KUTILS) $(LIB_TDEABC) + ui/libkicker_ui.la ../libkicker/libkickermain.la $(LIB_TDEIO) $(LIB_TDEUTILS) $(LIB_TDEABC) kicker_la_SOURCES = dummy.cpp kicker_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) diff --git a/kicker/kicker/plugins/Makefile.am b/kicker/kicker/plugins/Makefile.am index bab1011f9..38a5b611b 100644 --- a/kicker/kicker/plugins/Makefile.am +++ b/kicker/kicker/plugins/Makefile.am @@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = kickoffsearch_beagle.la kickoffsearch_beagle_la_SOURCES = kickoff-beagle-plugin.cpp beaglesearch.cpp # Libs needed by the plugin -kickoffsearch_beagle_la_LIBADD = $(LIB_KPARTS) ../interfaces/libkickoffsearch_interfaces.la \ +kickoffsearch_beagle_la_LIBADD = $(LIB_TDEPARTS) ../interfaces/libkickoffsearch_interfaces.la \ $(LIBBEAGLE_LIBADD) $(GLIB_LIBADD) # LD flags for the plugin diff --git a/kicker/libkicker/Makefile.am b/kicker/libkicker/Makefile.am index 5ec65be46..fb917c67e 100644 --- a/kicker/libkicker/Makefile.am +++ b/kicker/libkicker/Makefile.am @@ -11,7 +11,7 @@ libkickermain_la_SOURCES = appletinfo.cpp global.cpp kickertip.cpp \ libkickermain_la_METASOURCES = AUTO libkickermain_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined -libkickermain_la_LIBADD = $(LIB_KIO) +libkickermain_la_LIBADD = $(LIB_TDEIO) kde_kcfg_DATA = kickerSettings.kcfg diff --git a/kicker/libkicker/kickerSettings.kcfg b/kicker/libkicker/kickerSettings.kcfg index 4a84885d7..0b022a30e 100644 --- a/kicker/libkicker/kickerSettings.kcfg +++ b/kicker/libkicker/kickerSettings.kcfg @@ -153,7 +153,7 @@ </entry> <entry name="KickoffSearchAddressBook" type="Bool" > - <label>When this option is enabled, kabc is utilized to search for addresses. This may start KMail.</label> + <label>When this option is enabled, tdeabc is utilized to search for addresses. This may start KMail.</label> <default>false</default> </entry> diff --git a/kicker/menuext/konq-profiles/Makefile.am b/kicker/menuext/konq-profiles/Makefile.am index a5b95da38..14d706c70 100644 --- a/kicker/menuext/konq-profiles/Makefile.am +++ b/kicker/menuext/konq-profiles/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_konqueror.la kickermenu_konqueror_la_SOURCES = konqy_menu.cpp kickermenu_konqueror_la_LDFLAGS = $(all_libraries) -module -avoid-version -kickermenu_konqueror_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) +kickermenu_konqueror_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO) kickermenu_konqueror_la_METASOURCES = AUTO diff --git a/kicker/menuext/konsole/Makefile.am b/kicker/menuext/konsole/Makefile.am index 5abdf5a24..951b5ba23 100644 --- a/kicker/menuext/konsole/Makefile.am +++ b/kicker/menuext/konsole/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_konsole.la kickermenu_konsole_la_SOURCES = konsole_mnu.cpp konsolebookmarkhandler.cpp konsolebookmarkmenu.cpp kickermenu_konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version -kickermenu_konsole_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) +kickermenu_konsole_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO) kickermenu_konsole_la_METASOURCES = AUTO diff --git a/kicker/menuext/recentdocs/Makefile.am b/kicker/menuext/recentdocs/Makefile.am index 7bd91542a..5dd79e24b 100644 --- a/kicker/menuext/recentdocs/Makefile.am +++ b/kicker/menuext/recentdocs/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_recentdocs.la kickermenu_recentdocs_la_SOURCES = recentdocsmenu.cpp kickermenu_recentdocs_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kickermenu_recentdocs_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) +kickermenu_recentdocs_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO) kickermenu_recentdocs_la_METASOURCES = AUTO diff --git a/kicker/menuext/system/Makefile.am b/kicker/menuext/system/Makefile.am index a629970b6..298558277 100644 --- a/kicker/menuext/system/Makefile.am +++ b/kicker/menuext/system/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_systemmenu.la kickermenu_systemmenu_la_SOURCES = systemmenu.cpp kickermenu_systemmenu_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kickermenu_systemmenu_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) $(top_builddir)/kicker/libkicker/libkickermain.la +kickermenu_systemmenu_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/kicker/libkicker/libkickermain.la kickermenu_systemmenu_la_METASOURCES = AUTO diff --git a/kicker/menuext/tdeprint/Makefile.am b/kicker/menuext/tdeprint/Makefile.am index cd1032016..4486ff6fa 100644 --- a/kicker/menuext/tdeprint/Makefile.am +++ b/kicker/menuext/tdeprint/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_tdeprint.la kickermenu_tdeprint_la_SOURCES = print_mnu.cpp kickermenu_tdeprint_la_LDFLAGS = $(all_libraries) -module -avoid-version -kickermenu_tdeprint_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) -ltdeprint +kickermenu_tdeprint_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO) -ltdeprint kickermenu_tdeprint_la_METASOURCES = AUTO diff --git a/kicker/proxy/Makefile.am b/kicker/proxy/Makefile.am index 4dacc51f8..0ed35216d 100644 --- a/kicker/proxy/Makefile.am +++ b/kicker/proxy/Makefile.am @@ -17,7 +17,7 @@ extensionproxy_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version extensiondebugger_SOURCES = extensiondebugger.cpp extensiondebugger_LDADD = ../libkicker/libkickermain.la -extensiondebugger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +extensiondebugger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor messages: $(XGETTEXT) appletproxy.cpp -o $(podir)/appletproxy.pot diff --git a/kicker/taskbar/Makefile.am b/kicker/taskbar/Makefile.am index 6cf4b9e9c..e1495dbc3 100644 --- a/kicker/taskbar/Makefile.am +++ b/kicker/taskbar/Makefile.am @@ -9,7 +9,7 @@ libtaskbar_la_SOURCES = taskbarsettings.kcfgc taskcontainer.cpp taskbar.cpp \ libtaskbar_la_METASOURCES = AUTO libtaskbar_la_LDFLAGS = -version-info 3:0:2 $(all_libraries) -no-undefined -libtaskbar_la_LIBADD = $(LIB_TDEUI) $(LIB_KUTILS) ../libkicker/libkickermain.la ../taskmanager/libtaskmanager.la +libtaskbar_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEUTILS) ../libkicker/libkickermain.la ../taskmanager/libtaskmanager.la messages: rc.cpp $(XGETTEXT) *.cpp *.h -o $(podir)/libtaskbar.pot |