diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-17 23:20:19 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-17 23:20:19 +0900 |
commit | 35a40cb97014d2abdf518ac5aed1d5e2a93249fa (patch) | |
tree | 91d548a958869a64c784353be07dda3d818edd28 | |
parent | 635da4ab9b17c00a3a36eb4db381d296ca15cd40 (diff) | |
download | kftpgrabber-35a40cb9.tar.gz kftpgrabber-35a40cb9.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.m4 | 18 | ||||
-rw-r--r-- | kftpgrabber/src/Makefile.am | 2 | ||||
-rw-r--r-- | kftpgrabber/src/misc/interfaces/Makefile.am | 2 | ||||
-rw-r--r-- | kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/Makefile.am | 2 | ||||
-rw-r--r-- | kftpgrabber/src/misc/plugins/bookmarkimport/gftp/Makefile.am | 2 | ||||
-rw-r--r-- | kftpgrabber/src/misc/plugins/bookmarkimport/kftp/Makefile.am | 2 | ||||
-rw-r--r-- | kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/Makefile.am | 2 |
7 files changed, 15 insertions, 15 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index d778c08..5545f2e 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/kftpgrabber/src/Makefile.am b/kftpgrabber/src/Makefile.am index b85bd2e..690f969 100644 --- a/kftpgrabber/src/Makefile.am +++ b/kftpgrabber/src/Makefile.am @@ -49,7 +49,7 @@ kftpgrabber_LDADD = \ misc/interfaces/libkftpinterfaces.la \ misc/libs/ssh/libssh.a \ $(LIB_TDEDNSSD) -ltdewalletclient $(LIBSSL) $(LIB_TDEPARTS) \ - $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) -lz + $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) -lz # this is where the desktop file will go xdg_apps_DATA = kftpgrabber.desktop diff --git a/kftpgrabber/src/misc/interfaces/Makefile.am b/kftpgrabber/src/misc/interfaces/Makefile.am index 27644dd..a062aa2 100644 --- a/kftpgrabber/src/misc/interfaces/Makefile.am +++ b/kftpgrabber/src/misc/interfaces/Makefile.am @@ -9,7 +9,7 @@ METASOURCES = AUTO lib_LTLIBRARIES = libkftpinterfaces.la libkftpinterfaces_la_SOURCES = kftpbookmarkimportplugin.cpp libkftpinterfaces_la_LDFLAGS = $(all_libraries) -version-info 0:0:0 -no-undefined -libkftpinterfaces_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) +libkftpinterfaces_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) kftpgrabberincludedir = $(includedir)/kftpgrabber kftpgrabberinclude_HEADERS = kftpbookmarkimportplugin.h diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/Makefile.am b/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/Makefile.am index a590868..339062e 100644 --- a/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/Makefile.am +++ b/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/Makefile.am @@ -6,7 +6,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = kftpimportplugin_filezilla3.la kftpimportplugin_filezilla3_la_SOURCES = kftpimportfz3plugin.cpp -kftpimportplugin_filezilla3_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) ../../../interfaces/libkftpinterfaces.la +kftpimportplugin_filezilla3_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) ../../../interfaces/libkftpinterfaces.la kftpimportplugin_filezilla3_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) kde_services_DATA = kftpimportplugin_filezilla3.desktop diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/Makefile.am b/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/Makefile.am index 9d15dee..212e905 100644 --- a/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/Makefile.am +++ b/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/Makefile.am @@ -6,7 +6,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = kftpimportplugin_gftp.la kftpimportplugin_gftp_la_SOURCES = kftpimportgftpplugin.cpp -kftpimportplugin_gftp_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) ../../../interfaces/libkftpinterfaces.la +kftpimportplugin_gftp_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) ../../../interfaces/libkftpinterfaces.la kftpimportplugin_gftp_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) kde_services_DATA = kftpimportplugin_gftp.desktop diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/Makefile.am b/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/Makefile.am index a287dc2..2cd034f 100644 --- a/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/Makefile.am +++ b/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/Makefile.am @@ -6,7 +6,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = kftpimportplugin_kftp.la kftpimportplugin_kftp_la_SOURCES = kftpimportkftpplugin.cpp -kftpimportplugin_kftp_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) ../../../interfaces/libkftpinterfaces.la +kftpimportplugin_kftp_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) ../../../interfaces/libkftpinterfaces.la kftpimportplugin_kftp_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) kde_services_DATA = kftpimportplugin_kftp.desktop diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/Makefile.am b/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/Makefile.am index a02c438..806d490 100644 --- a/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/Makefile.am +++ b/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/Makefile.am @@ -6,7 +6,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = kftpimportplugin_ncftp.la kftpimportplugin_ncftp_la_SOURCES = kftpimportncftpplugin.cpp -kftpimportplugin_ncftp_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) ../../../interfaces/libkftpinterfaces.la +kftpimportplugin_ncftp_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) ../../../interfaces/libkftpinterfaces.la kftpimportplugin_ncftp_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) kde_services_DATA = kftpimportplugin_ncftp.desktop |