summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-29 23:25:10 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-29 23:25:10 -0600
commitdea1ae726f2998bc68de95026b94ddaa4add7628 (patch)
tree5939dc6cff078f19e1ffab7127661f220cbafa33
parent9d5f096d28acabd42961aee9222c58c929300364 (diff)
downloadkvpnc-dea1ae726f2998bc68de95026b94ddaa4add7628.tar.gz
kvpnc-dea1ae726f2998bc68de95026b94ddaa4add7628.zip
Rename a few build variables for overall consistency
-rw-r--r--acinclude.m46
-rw-r--r--src/Makefile.am2
2 files changed, 4 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index b8b589f..5fee4e7 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2087,14 +2087,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_KDECORE, "-lkdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui")
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")
@@ -2104,7 +2104,7 @@ else
AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
- AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
+ AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
fi
])
diff --git a/src/Makefile.am b/src/Makefile.am
index 230a086..19cacf5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -49,7 +49,7 @@ kvpnc_METASOURCES = AUTO
#CXXFLAGS = $(libgcrypt-config --libs --cflags)
-kvpnc_LDADD = $(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIBSOCKET) -lgcrypt -ltdewalletclient -lDCOP
+kvpnc_LDADD = $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIBSOCKET) -lgcrypt -ltdewalletclient -lDCOP