diff options
| -rw-r--r-- | acinclude.m4 | 8 | ||||
| m--------- | admin | 0 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 08959d0..cb72b57 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2018,7 +2018,7 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES], if test $kde_qtver = 3; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_KIO, "-lkio") + AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KABC, "-lkabc") @@ -2029,12 +2029,12 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KUTILS, "-ltdeutils") AC_SUBST(LIB_TDEPIM, "-ltdepim") # 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/admin b/admin -Subproject b6d5b675493a44e3e789cc914da0d18914d2bb3 +Subproject b2340915fde2845f481d9aad9e5e89820fbfedc diff --git a/src/Makefile.am b/src/Makefile.am index e623498..3cad111 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,7 +27,7 @@ kpicosim_SOURCES = main.cpp kpicosim.cpp codeeditor.cpp ksimulator.cpp \ kport.cpp kexportdialog.cpp cassembler.cpp cinstruction.cpp cpicoblaze.cpp \ jtagdevice.cpp kjtagdialog.cpp jtag.cpp jtag.h jtagprogrammer.cpp kpicosim_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kpicosim_LDADD = -lkio $(LIB_TDEUI) +kpicosim_LDADD = -ltdeio $(LIB_TDEUI) # this is where the desktop file will go shelldesktopdir = $(kde_appsdir)/Development |