diff options
| author | Timothy Pearson <[email protected]> | 2013-01-29 23:20:17 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-29 23:20:17 -0600 |
| commit | 1e62e1264d1ee5961335f1a787e2a1766f4fa30d (patch) | |
| tree | 07536377a8569daf06f5ceb9218ec63bb122382a | |
| parent | c9717c2787f3cca383547f0771b78e7405f4f904 (diff) | |
| download | kbookreader-1e62e1264d1ee5961335f1a787e2a1766f4fa30d.tar.gz kbookreader-1e62e1264d1ee5961335f1a787e2a1766f4fa30d.zip | |
Rename a few build variables for overall consistency
| -rw-r--r-- | acinclude.m4 | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 58a563e..1e1937e 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2022,14 +2022,14 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_TDEPIM, "-ltdepim") # 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") @@ -2039,7 +2039,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/Makefile.am b/src/Makefile.am index 01bd9cc..4bb48f7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,7 +11,7 @@ INCLUDES = $(all_includes) bookreader_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor # the libraries to link against. -bookreader_LDADD = $(LIB_KFILE) $(LIB_TDEPRINT) +bookreader_LDADD = $(LIB_TDEFILE) $(LIB_TDEPRINT) # which sources should be compiled for bookreader bookreader_SOURCES = main.cpp bookreader.cpp bookreaderiface.skel \ |