summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-28 10:22:20 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-28 10:22:20 -0600
commit8455d9936fc8edb6ccc65aae602400ab25b725cb (patch)
tree9344ee0462741b2f9fd0ed04bcb76b48b16ba011
parent6e7304921eb71144c7b9fe2a7f9733480f7ff10f (diff)
downloadkdpkg-8455d993.tar.gz
kdpkg-8455d993.zip
Fix up remaining references to -lkio
-rw-r--r--acinclude.m48
-rw-r--r--kdpkg-install/Makefile.am2
-rw-r--r--kdpkg/Makefile.am2
3 files changed, 6 insertions, 6 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 0a829c4..fb24d6a 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2070,7 +2070,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")
@@ -2086,12 +2086,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/kdpkg-install/Makefile.am b/kdpkg-install/Makefile.am
index 3bc937b..dc6a4cc 100644
--- a/kdpkg-install/Makefile.am
+++ b/kdpkg-install/Makefile.am
@@ -9,7 +9,7 @@ METASOURCES = AUTO
# the application source, library search path, and link libraries
kdpkg_install_SOURCES = main.cpp install.cpp installdialog.ui process.cpp console.cpp consoledialog.ui
-kdpkg_install_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lkio
+kdpkg_install_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdeio
kdpkg_install_LDADD = $(LIB_TDEUI)
diff --git a/kdpkg/Makefile.am b/kdpkg/Makefile.am
index 3452a10..870050b 100644
--- a/kdpkg/Makefile.am
+++ b/kdpkg/Makefile.am
@@ -9,7 +9,7 @@ METASOURCES = AUTO
# the application source, library search path, and link libraries
kdpkg_SOURCES = main.cpp kdpkg.cpp kdpkgdialog.ui process.cpp
-kdpkg_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lkio
+kdpkg_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdeio
kdpkg_LDADD = $(LIB_TDEUI)