summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2018-09-17 23:20:46 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2018-09-17 23:20:46 +0900
commitfd62b0de8e2fba87f2b49f4fbdf2071595c3738f (patch)
tree1618dfb7281f2d668c58998c3b807d7269fbed11
parent15e7ddb3a0e76e10eece6db6a646b8d5b76fb4d7 (diff)
downloadtork-fd62b0de8e2fba87f2b49f4fbdf2071595c3738f.tar.gz
tork-fd62b0de8e2fba87f2b49f4fbdf2071595c3738f.zip
LIB_QT -> LIB_TQT conversion to align to updated admin module
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--acinclude.m418
-rw-r--r--src/Makefile.am2
-rw-r--r--src/arkollon/Makefile.am4
-rw-r--r--src/torkapplet/Makefile.am2
4 files changed, 13 insertions, 13 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 1bbfdfe..e7b713b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1577,19 +1577,19 @@ AC_PATH_QT_MOC_UIC
KDE_CHECK_QT_JPEG
if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
+LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
else
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
+LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
fi
-test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS"
+test -z "$KDE_MT_LIBS" || LIB_TQT="$LIB_TQT $KDE_MT_LIBS"
for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
if test -e "$a"; then
- LIB_QT="$LIB_QT ${kde_int_qt}_incremental"
+ LIB_TQT="$LIB_TQT ${kde_int_qt}_incremental"
break
fi
done
-AC_SUBST(LIB_QT)
+AC_SUBST(LIB_TQT)
AC_SUBST(LIB_QPE)
AC_SUBST(kde_qtver)
@@ -2101,7 +2101,7 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else
- AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
+ AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_TQT)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
@@ -5443,8 +5443,8 @@ AC_DEFUN([AC_PATH_QTOPIA],
AC_MSG_CHECKING([for Qtopia])
- LIB_QTOPIA="-lqpe"
- AC_SUBST(LIB_QTOPIA)
+ LIB_TQTOPIA="-lqpe"
+ AC_SUBST(LIB_TQTOPIA)
kde_qtopia_dirs="$QPEDIR /opt/Qtopia"
@@ -5491,7 +5491,7 @@ is required.])
CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes"
LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
- LIBS="$LIBS $LIB_QTOPIA $LIBQT"
+ LIBS="$LIBS $LIB_TQTOPIA $LIBQT"
cat > conftest.$ac_ext <<EOF
#include "confdefs.h"
diff --git a/src/Makefile.am b/src/Makefile.am
index 16e644e..512d29e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,7 +28,7 @@ METASOURCES = AUTO
tork_LDFLAGS = $(KDE_RPATH) $(all_libraries)
# the libraries to link against.
-tork_LDADD = $(LIB_TDEIO) $(LIB_KFILE) $(LIB_TDEHTML) $(geoiplib) $(LIB_TDEUI) $(LIB_TDECORE) -lDCOP $(LIB_QT) \
+tork_LDADD = $(LIB_TDEIO) $(LIB_KFILE) $(LIB_TDEHTML) $(geoiplib) $(LIB_TDEUI) $(LIB_TDECORE) -lDCOP $(LIB_TQT) \
upnp/libktupnp.la $(CRYPTO_LIBS)
# which sources should be compiled for tork
diff --git a/src/arkollon/Makefile.am b/src/arkollon/Makefile.am
index e0af4ce..5efaf0e 100644
--- a/src/arkollon/Makefile.am
+++ b/src/arkollon/Makefile.am
@@ -25,8 +25,8 @@ INCLUDES= $(all_includes)
torkarkollon_LDFLAGS = $(all_libraries)
LIBS =
#torkarkollon_LDFLAGS =
-#torkarkollon_LDADD = $(LIB_QT) $(LIB_KFILE)
-torkarkollon_LDADD = $(LIB_KFILE) $(LIB_QT) $(LIB_TDECORE)
+#torkarkollon_LDADD = $(LIB_TQT) $(LIB_KFILE)
+torkarkollon_LDADD = $(LIB_KFILE) $(LIB_TQT) $(LIB_TDECORE)
# let automoc handle all of the meta source files (moc)
METASOURCES = AUTO
diff --git a/src/torkapplet/Makefile.am b/src/torkapplet/Makefile.am
index e823598..ad972e0 100644
--- a/src/torkapplet/Makefile.am
+++ b/src/torkapplet/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kickermenu_tork.la
kickermenu_tork_la_SOURCES = tork_mnu.cpp ../functions.cpp
kickermenu_tork_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kickermenu_tork_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDECORE) -lDCOP $(LIB_QT)
+kickermenu_tork_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDECORE) -lDCOP $(LIB_TQT)
kickermenu_tork_la_METASOURCES = AUTO