diff options
| author | Timothy Pearson <[email protected]> | 2013-01-28 10:22:19 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-28 10:22:19 -0600 |
| commit | b539e51290e5f5a551c73d1b3dbb5b20039d208a (patch) | |
| tree | 330be996e83ef357da4f4aceb4b7d477bb9cc83b | |
| parent | eaccd285b3c2e582cd89eace87821ab12e428d4f (diff) | |
| download | k3b-b539e51290e5f5a551c73d1b3dbb5b20039d208a.tar.gz k3b-b539e51290e5f5a551c73d1b3dbb5b20039d208a.zip | |
Fix up remaining references to -lkio
| -rw-r--r-- | acinclude.m4 | 8 | ||||
| -rw-r--r-- | plugins/project/audiometainforenamer/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/project/audioprojectcddb/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | tdeioslaves/videodvd/Makefile.am | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 4b73468..213de6d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2094,7 +2094,7 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_KIO, "-lkio") + AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") @@ -2110,12 +2110,12 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KDNSSD, "-ltdednssd") AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") # these are for backward compatibility - AC_SUBST(LIB_KSYCOCA, "-lkio") - AC_SUBST(LIB_KFILE, "-lkio") + AC_SUBST(LIB_KSYCOCA, "-ltdeio") + AC_SUBST(LIB_KFILE, "-ltdeio") elif test $kde_qtver = 2; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_KIO, "-lkio") + AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KFILE, "-ltdefile") diff --git a/plugins/project/audiometainforenamer/Makefile.am b/plugins/project/audiometainforenamer/Makefile.am index 5a10957..eaf50b7 100644 --- a/plugins/project/audiometainforenamer/Makefile.am +++ b/plugins/project/audiometainforenamer/Makefile.am @@ -11,7 +11,7 @@ kde_module_LTLIBRARIES = libk3baudiometainforenamerplugin.la libk3baudiometainforenamerplugin_la_SOURCES = k3baudiometainforenamerplugin.cpp libk3baudiometainforenamerplugin_la_LIBADD = ../../../libk3b/libk3b.la -libk3baudiometainforenamerplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lkio -ltdecore -ltdeui -L../../../libk3bdevice/.libs -lk3bdevice +libk3baudiometainforenamerplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -ltdeio -ltdecore -ltdeui -L../../../libk3bdevice/.libs -lk3bdevice pluginsdir = $(kde_datadir)/k3b/plugins plugins_DATA = k3baudiometainforenamerplugin.plugin diff --git a/plugins/project/audioprojectcddb/Makefile.am b/plugins/project/audioprojectcddb/Makefile.am index 258023f..aff9bde 100644 --- a/plugins/project/audioprojectcddb/Makefile.am +++ b/plugins/project/audioprojectcddb/Makefile.am @@ -14,7 +14,7 @@ libk3baudioprojectcddbplugin_la_SOURCES = k3baudioprojectcddbplugin.cpp libk3baudioprojectcddbplugin_la_LIBADD = ../../../libk3b/libk3b.la -libk3baudioprojectcddbplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lkio -ltdecore -ltdeui -L../../../libk3bdevice/.libs -lk3bdevice +libk3baudioprojectcddbplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -ltdeio -ltdecore -ltdeui -L../../../libk3bdevice/.libs -lk3bdevice pluginsdir = $(kde_datadir)/k3b/plugins plugins_DATA = k3baudioprojectcddbplugin.plugin diff --git a/src/Makefile.am b/src/Makefile.am index a04021f..2b247e9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,7 +28,7 @@ k3b_SOURCES = k3bwelcomewidget.cpp k3bapplication.cpp k3bdiroperator.cpp \ k3b_LDADD = ./option/liboption.la ./rip/librip.la \ ./projects/libprojects.la ../libk3bdevice/libk3bdevice.la \ ../libk3b/libk3b.la ./misc/libmisc.la ./fastscale/libfastscale.la \ - -ltdefx -lkio -ltdeparts $(CAM_LIB) $(MUSICBRAINZ_LIBS) + -ltdefx -ltdeio -ltdeparts $(CAM_LIB) $(MUSICBRAINZ_LIBS) SUBDIRS = option misc rip projects fastscale pics icons konqi mimetypes sounds diff --git a/tdeioslaves/videodvd/Makefile.am b/tdeioslaves/videodvd/Makefile.am index c20e773..2f30b70 100644 --- a/tdeioslaves/videodvd/Makefile.am +++ b/tdeioslaves/videodvd/Makefile.am @@ -6,8 +6,8 @@ INCLUDES = -I$(srcdir)/../../libk3b/tools \ kde_module_LTLIBRARIES = kio_videodvd.la kio_videodvd_la_SOURCES = videodvd.cpp -kio_videodvd_la_LIBADD = -lkio ../../libk3b/libk3b.la -kio_videodvd_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) -lkio -ltdecore -L../../libk3bdevice/.libs -lk3bdevice +kio_videodvd_la_LIBADD = -ltdeio ../../libk3b/libk3b.la +kio_videodvd_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) -ltdeio -ltdecore -L../../libk3bdevice/.libs -lk3bdevice protocol_DATA = videodvd.protocol protocoldir = $(kde_servicesdir) |