diff options
| author | Timothy Pearson <[email protected]> | 2013-01-29 23:21:12 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-29 23:21:12 -0600 |
| commit | 8c1f68bb0f10330d548ed0f9c915626712a435b8 (patch) | |
| tree | 57f3cb8ff14eaa0d4386e31fb7dcff5cb0f063b5 | |
| parent | d0429e9314b2cf443cd556a665f1ed4a6eb4cdcf (diff) | |
| download | kiosktool-8c1f68bb0f10330d548ed0f9c915626712a435b8.tar.gz kiosktool-8c1f68bb0f10330d548ed0f9c915626712a435b8.zip | |
Rename a few build variables for overall consistency
| -rw-r--r-- | acinclude.m4 | 6 | ||||
| -rw-r--r-- | aclocal.m4 | 6 | ||||
| -rw-r--r-- | kiosktool/Makefile.am | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 8f3112f..f8cdae9 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2042,14 +2042,14 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") # 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") @@ -2059,7 +2059,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 ]) @@ -2054,14 +2054,14 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") # 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") @@ -2071,7 +2071,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/kiosktool/Makefile.am b/kiosktool/Makefile.am index 42aee63..47756e9 100644 --- a/kiosktool/Makefile.am +++ b/kiosktool/Makefile.am @@ -15,7 +15,7 @@ INCLUDES = $(all_includes) kiosktool_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor # the libraries to link against. -kiosktool_LDADD = $(LIB_KFILE) -ltdeprint +kiosktool_LDADD = $(LIB_TDEFILE) -ltdeprint # which sources should be compiled for kiosktool kiosktool_SOURCES = main.cpp kioskgui.cpp kioskdata.cpp kioskrun.cpp \ |