diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-29 23:19:18 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-29 23:19:18 -0600 |
| commit | da8436ef9675cdbe6e405e31dbb63dd59ef47cc2 (patch) | |
| tree | 958c1b8ea0745b80e6b71502226014b90e4e36ce | |
| parent | 04fe91ab3caf86bcbf427dc64fd7454c1a2aa659 (diff) | |
| download | dolphin-da8436ef9675cdbe6e405e31dbb63dd59ef47cc2.tar.gz dolphin-da8436ef9675cdbe6e405e31dbb63dd59ef47cc2.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 c586605..9a03458 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2111,14 +2111,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") @@ -2128,7 +2128,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 e209891..6c17e39 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -13,7 +13,7 @@ INCLUDES = $(all_includes) d3lphin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor # the libraries to link against. -d3lphin_LDADD = $(LIB_KFILE) $(LIB_TDEPRINT) -lkonq +d3lphin_LDADD = $(LIB_TDEFILE) $(LIB_TDEPRINT) -lkonq # which sources should be compiled for d3lphin d3lphin_SOURCES = bookmarkselector.cpp bookmarkssettingspage.cpp \ |