LIB_QT -> LIB_TQT conversion to align to updated admin module

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

4 files changed, 18 insertions, 18 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index f9e616d..49cf99b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1576,19 +1576,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)
@@ -2099,7 +2099,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_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
@@ -5292,8 +5292,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"
 
@@ -5340,7 +5340,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/file-integration/Makefile.am b/file-integration/Makefile.am
index f5e7774..7fde328 100644
--- a/file-integration/Makefile.am
+++ b/file-integration/Makefile.am
@@ -11,7 +11,7 @@ INCLUDES = $(all_includes)
 kde_module_LTLIBRARIES = basketthumbcreator.la
 basketthumbcreator_la_SOURCES = basketthumbcreator.cpp
 basketthumbcreator_la_LIBADD = $(LIB_TDEIO)
-basketthumbcreator_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx
+basketthumbcreator_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx
 kde_services_DATA = basketthumbcreator.desktop
 
 # Icons:
diff --git a/kontact_plugin/Makefile.am b/kontact_plugin/Makefile.am
index fc097fe..5fd5369 100644
--- a/kontact_plugin/Makefile.am
+++ b/kontact_plugin/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir) $(all_inclu
 
 kde_module_LTLIBRARIES = libkontact_basket.la
 libkontact_basket_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkontact_basket_la_LIBADD = -lkpinterfaces $(LIB_QT) -lDCOP -ltdecore -ltdeui
+libkontact_basket_la_LIBADD = -lkpinterfaces $(LIB_TQT) -lDCOP -ltdecore -ltdeui
 
 noinst_HEADERS = basket_plugin.h uniqueapphandler.h
 libkontact_basket_la_SOURCES = basket_plugin.cpp uniqueapphandler.cpp basketdcopiface.stub
diff --git a/src/Makefile.am b/src/Makefile.am
index aaa1fa8..075a935 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,10 +29,10 @@ lib_LTLIBRARIES = libbasketcommon.la
 
 AM_CPPFLAGS = $(GPGME_CFLAGS)
 
-libbasketcommon_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) -ltdecore -lDCOP -ltdeui $(LIB_QT) -lkjs -ltdefx $(LIBDL) -lartsc -lartskde -lartskde
+libbasketcommon_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) -ltdecore -lDCOP -ltdeui $(LIB_TQT) -lkjs -ltdefx $(LIBDL) -lartsc -lartskde -lartskde
 
 libbasketcommon_la_LIBADD = $(LIB_ARTSKDE) -ltdeio $(LIB_TDEUI) $(LIB_TDECORE) \
-	$(LIB_QT) $(LIBSOCKET) $(GPGME_LIBS) $(LIB_TDEPARTS) -lDCOP -ltdefx -ltdeui -ltdecore $(LIB_QT) -ltdefx $(LIBDL) -lartsc
+	$(LIB_TQT) $(LIBSOCKET) $(GPGME_LIBS) $(LIB_TDEPARTS) -lDCOP -ltdefx -ltdeui -ltdecore $(LIB_TQT) -ltdefx $(LIBDL) -lartsc
 
 libbasketcommon_la_SOURCES = \
 	archive.cpp bnpview.cpp settings.cpp basket.cpp basketproperties.cpp \
@@ -57,7 +57,7 @@ libbasketcommon_la_COMPILE_FIRST = likeback_private.moc.cpp
 bin_PROGRAMS = basket
 
 # the application source, library search path, and link libraries
-basket_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TDEUTILS) -ltdecore -lDCOP -ltdeui $(LIB_QT) -lkjs -ltdefx $(LIBDL) -lartsc -lartskde -lartskde
+basket_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TDEUTILS) -ltdecore -lDCOP -ltdeui $(LIB_TQT) -lkjs -ltdefx $(LIBDL) -lartsc -lartskde -lartskde
 basket_LDADD = libbasketcommon.la
 
 # this is where the desktop file will go
@@ -85,12 +85,12 @@ kde_icon_KDEICON = cr128-app-basket.png cr16-app-basket.png cr22-app-basket.png
 kde_module_LTLIBRARIES = kcm_basket.la libbasketpart.la
 
 libbasketpart_la_SOURCES = basket_part.cpp
-libbasketpart_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lDCOP -lkjs -ltdefx $(LIBDL) -lartsc -lartskde -lartskde
-libbasketpart_la_LIBADD  = libbasketcommon.la -ltdeparts -ltdeui $(LIB_TDECORE) $(LIB_QT) -lDCOP
+libbasketpart_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_TQT) -lDCOP -lkjs -ltdefx $(LIBDL) -lartsc -lartskde -lartskde
+libbasketpart_la_LIBADD  = libbasketcommon.la -ltdeparts -ltdeui $(LIB_TDECORE) $(LIB_TQT) -lDCOP
 
 kcm_basket_la_SOURCES = kcm_basket.cpp
-kcm_basket_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lDCOP -lkjs -ltdefx $(LIBDL) -lartsc -lartskde
-kcm_basket_la_LIBADD = libbasketcommon.la $(LIB_TDECORE) $(LIB_QT) -ltdeui -lDCOP
+kcm_basket_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_TQT) -lDCOP -lkjs -ltdefx $(LIBDL) -lartsc -lartskde
+kcm_basket_la_LIBADD = libbasketcommon.la $(LIB_TDECORE) $(LIB_TQT) -ltdeui -lDCOP
 
 # this is where the desktop file will go
 partdesktopdir   = $(kde_servicesdir)