diff --git a/acinclude.m4 b/acinclude.m4 index fad5d01..c3eb5b0 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2078,14 +2078,14 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") # these are for backward compatibility AC_SUBST(LIB_KSYCOCA, "-ltdeio") - AC_SUBST(LIB_KFILE, "-ltdeio") + AC_SUBST(LIB_TDEFILE, "-ltdeio") elif test $kde_qtver = 2; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-ltdefile") + AC_SUBST(LIB_TDEFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") @@ -2095,7 +2095,7 @@ else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") - AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) diff --git a/src/app/Makefile.am b/src/app/Makefile.am index cab3044..68db340 100644 --- a/src/app/Makefile.am +++ b/src/app/Makefile.am @@ -51,6 +51,6 @@ check_PROGRAMS = testvtabwidget testvtabwidget_SOURCES = testvtabwidget.cpp testvtabwidget_LDADD = \ libgwenshared.la \ - $(LIB_KUTILS) $(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEPRINT) $(LIB_QT) \ + $(LIB_KUTILS) $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEPRINT) $(LIB_QT) \ $(LIBJPEG) testvtabwidget_LDFLAGS = $(all_libraries) $(LIB_QT) diff --git a/src/gvcore/Makefile.am b/src/gvcore/Makefile.am index f0eb7e2..9e981e9 100644 --- a/src/gvcore/Makefile.am +++ b/src/gvcore/Makefile.am @@ -5,7 +5,7 @@ lib_LTLIBRARIES = libgwenviewcore.la libgwenviewcore_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined libgwenviewcore_la_LIBADD = \ - $(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEPRINT) $(LIB_QT) \ + $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEPRINT) $(LIB_QT) \ $(LIBJPEG) $(LIBPNG) $(LIBMNG) $(GV_LIB_XCURSOR) $(LIB_EXIV2) $(LIB_KPARTS) -ltdefx \ -ltdemediaplayer ../imageutils/libgvimageutils.la \ ../tsthread/libtsthread.la diff --git a/src/imageutils/Makefile.am b/src/imageutils/Makefile.am index 9fba7c9..6f2e08f 100644 --- a/src/imageutils/Makefile.am +++ b/src/imageutils/Makefile.am @@ -32,5 +32,5 @@ METASOURCES = AUTO check_PROGRAMS = testjpegcontent testjpegcontent_SOURCES = testjpegcontent.cpp -testjpegcontent_LDADD = $(LIB_KFILE) libgvimageutils.la +testjpegcontent_LDADD = $(LIB_TDEFILE) libgvimageutils.la testjpegcontent_LDFLAGS = $(all_libraries)