Fix up remaining references to -lkio

pull/2/head
Timothy Pearson 12 years ago
parent 31885d27e0
commit 03fdb0c731

@ -1 +1 @@
Subproject commit b6d5b675493a44e3e789cc914da0d18914d2bb39 Subproject commit b2340915fde2845f481d9aad9e5e89820fbfedca

@ -11,7 +11,7 @@ conduit_address_la_SOURCES = \
abbrowser-setup.cc \ abbrowser-setup.cc \
kabcRecord.cc \ kabcRecord.cc \
abbrowser-conduit.cc abbrowser-conduit.cc
conduit_address_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui conduit_address_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui
conduit_address_la_LIBADD = ../../lib/libkpilot.la -lkabc -lkabc_file conduit_address_la_LIBADD = ../../lib/libkpilot.la -lkabc -lkabc_file
servicedir = $(kde_servicesdir) servicedir = $(kde_servicesdir)

@ -21,7 +21,7 @@ libpalmdoc_shared_la_LDFLAGS = $(PISOCK_LDFLAGS) $(PISOCK_LIB)
libpalmdoc_shared_la_LIBADD = $(PISOCK_LDFLAGS) $(PISOCK_LIB) libpalmdoc_shared_la_LIBADD = $(PISOCK_LDFLAGS) $(PISOCK_LIB)
conduit_doc_la_SOURCES = docconduitSettings.kcfgc doc-factory.cc doc-setup.cc doc-conduit.cc doc-setupdialog.ui doc-conflictdialog.cc conduit_doc_la_SOURCES = docconduitSettings.kcfgc doc-factory.cc doc-setup.cc doc-conduit.cc doc-setupdialog.ui doc-conflictdialog.cc
conduit_doc_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LDFLAGS) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui conduit_doc_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LDFLAGS) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui
conduit_doc_la_LIBADD = ../../lib/libkpilot.la libpalmdoc_shared.la \ conduit_doc_la_LIBADD = ../../lib/libkpilot.la libpalmdoc_shared.la \
$(LIB_TDEUI) $(LIB_KFILE) $(PISOCK_LDFLAGS) $(PISOCK_LIB) $(LIB_TDEUI) $(LIB_KFILE) $(PISOCK_LDFLAGS) $(PISOCK_LIB)

@ -15,7 +15,7 @@ conduit_knotes_la_SOURCES = \
knotes-action.cc \ knotes-action.cc \
setup_base.ui setup_base.ui
conduit_knotes_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui -lkcal conduit_knotes_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui -lkcal
conduit_knotes_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI) conduit_knotes_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI)
kde_kcfg_DATA = knotesconduit.kcfg kde_kcfg_DATA = knotesconduit.kcfg

@ -13,6 +13,6 @@ kde_kcfg_DATA = malconduit.kcfg
kde_module_LTLIBRARIES = conduit_mal.la kde_module_LTLIBRARIES = conduit_mal.la
conduit_mal_la_SOURCES = malconduitSettings.kcfgc mal-setup_dialog.ui mal-factory.cc mal-setup.cc mal-conduit.cc conduit_mal_la_SOURCES = malconduitSettings.kcfgc mal-setup_dialog.ui mal-factory.cc mal-setup.cc mal-conduit.cc
conduit_mal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui conduit_mal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui
conduit_mal_la_LIBADD = ../../lib/libkpilot.la $(MAL_LIB) $(LIB_TDEUI) conduit_mal_la_LIBADD = ../../lib/libkpilot.la $(MAL_LIB) $(LIB_TDEUI)

@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = conduit_memofile.la
conduit_memofile_la_SOURCES = memofileSettings.kcfgc setup_base.ui \ conduit_memofile_la_SOURCES = memofileSettings.kcfgc setup_base.ui \
memofile-factory.cc memofile.cc memofiles.cc memofile-conduit.cc memofile-factory.cc memofile.cc memofiles.cc memofile-conduit.cc
conduit_memofile_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui conduit_memofile_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui
conduit_memofile_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI) $(LIB_KFILE) conduit_memofile_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI) $(LIB_KFILE)
kde_kcfg_DATA = memofileconduit.kcfg kde_kcfg_DATA = memofileconduit.kcfg

@ -9,6 +9,6 @@ kde_module_LTLIBRARIES = conduit_notepad.la
conduit_notepad_la_SOURCES = notepadconduit.kcfgc notepad-setup.ui \ conduit_notepad_la_SOURCES = notepadconduit.kcfgc notepad-setup.ui \
notepad-conduit.cc notepad-factory.cc notepad-conduit.cc notepad-factory.cc
conduit_notepad_la_LDFLAGS= -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui conduit_notepad_la_LDFLAGS= -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui
conduit_notepad_la_LIBADD= ../../lib/libkpilot.la $(LIB_TDEUI) $(LIB_KIO) conduit_notepad_la_LIBADD= ../../lib/libkpilot.la $(LIB_TDEUI) $(LIB_KIO)

@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = conduit_null.la
conduit_null_la_SOURCES = nullSettings.kcfgc setup_base.ui null-conduit.cc null-factory.cc conduit_null_la_SOURCES = nullSettings.kcfgc setup_base.ui null-conduit.cc null-factory.cc
conduit_null_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui conduit_null_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui
conduit_null_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI) conduit_null_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI)
kde_kcfg_DATA = nullconduit.kcfg kde_kcfg_DATA = nullconduit.kcfg

@ -16,7 +16,7 @@ kde_module_LTLIBRARIES = conduit_popmail.la
conduit_popmail_la_SOURCES = popmailSettings.kcfgc setup-dialog.ui \ conduit_popmail_la_SOURCES = popmailSettings.kcfgc setup-dialog.ui \
popmail-factory.cc setupDialog.cc \ popmail-factory.cc setupDialog.cc \
popmail-conduit.cc popmail-conduit.cc
conduit_popmail_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui -lDCOP conduit_popmail_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui -lDCOP
conduit_popmail_la_LIBADD = ../../lib/libkpilot.la $(LIB_KIO) conduit_popmail_la_LIBADD = ../../lib/libkpilot.la $(LIB_KIO)
# this option you can leave out. Just, if you use "make dist", you need it # this option you can leave out. Just, if you use "make dist", you need it

@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = conduit_record.la
conduit_record_la_SOURCES = settings.kcfgc setup_base.ui factory.cc conduit_record_la_SOURCES = settings.kcfgc setup_base.ui factory.cc
conduit_record_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui conduit_record_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui
conduit_record_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI) conduit_record_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI)
kde_kcfg_DATA = settings.kcfg kde_kcfg_DATA = settings.kcfg

@ -15,7 +15,7 @@ conduit_sysinfo_la_SOURCES = sysinfoSettings.kcfgc \
sysinfo-setup.cc \ sysinfo-setup.cc \
sysinfo-conduit.cc \ sysinfo-conduit.cc \
sysinfo-setup_dialog.ui sysinfo-setup_dialog.ui
conduit_sysinfo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui conduit_sysinfo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui
conduit_sysinfo_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI) $(LIB_KIO) conduit_sysinfo_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI) $(LIB_KIO)
kpilot_sysinfo_data_DATA = Template.html Template.txt kpilot_sysinfo_data_DATA = Template.html Template.txt

@ -16,7 +16,7 @@ conduit_time_la_SOURCES = timeConduitSettings.kcfgc \
time-setup.cc \ time-setup.cc \
time-conduit.cc \ time-conduit.cc \
time-setup_dialog.ui time-setup_dialog.ui
conduit_time_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui conduit_time_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui
conduit_time_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI) conduit_time_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI)
kde_kcfg_DATA = timeconduit.kcfg kde_kcfg_DATA = timeconduit.kcfg

@ -24,14 +24,14 @@ libvcalconduit_shared_la_SOURCES = vcalconduitSettings.kcfgc \
conduit_vcal_la_SOURCES = vcal-conduit.cc vcalRecord.cc \ conduit_vcal_la_SOURCES = vcal-conduit.cc vcalRecord.cc \
vcal-factory.cc vcal-setup.cc vcal-factory.cc vcal-setup.cc
conduit_vcal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui -lkcal -ltderesources conduit_vcal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui -lkcal -ltderesources
conduit_vcal_la_LIBADD = ../../lib/libkpilot.la \ conduit_vcal_la_LIBADD = ../../lib/libkpilot.la \
libvcalconduit_shared.la libvcalconduit_shared.la
conduit_vcal_la_COMPILE_FIRST = vcalconduitSettings.h korganizerConduit.h conduit_vcal_la_COMPILE_FIRST = vcalconduitSettings.h korganizerConduit.h
conduit_todo_la_SOURCES = todo-conduit.cc todoRecord.cc \ conduit_todo_la_SOURCES = todo-conduit.cc todoRecord.cc \
todo-factory.cc todo-setup.cc todo-factory.cc todo-setup.cc
conduit_todo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui -lkcal -ltderesources conduit_todo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui -lkcal -ltderesources
conduit_todo_la_LIBADD = ../../lib/libkpilot.la \ conduit_todo_la_LIBADD = ../../lib/libkpilot.la \
libvcalconduit_shared.la libvcalconduit_shared.la
conduit_todo_la_COMPILE_FIRST = vcalconduitSettings.h korganizerConduit.h conduit_todo_la_COMPILE_FIRST = vcalconduitSettings.h korganizerConduit.h

Loading…
Cancel
Save