TDE
/
kftpgrabber
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kftpgrabber
0
0
Fork 0
Code Issues Releases Wiki Activity

LIB_QT -> LIB_TQT conversion to align to updated admin module

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/1/head
Michele Calgaro 6 years ago
parent 635da4ab9b
commit 35a40cb970
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File

18
acinclude.m4
Unescape View File

@ -1577,19 +1577,19 @@ AC_PATH_QT_MOC_UIC
KDE_CHECK_QT_JPEG KDE_CHECK_QT_JPEG
if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then 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 else
LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)' LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
fi 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 for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
if test -e "$a"; then if test -e "$a"; then
LIB_QT="$LIB_QT ${kde_int_qt}_incremental" LIB_TQT="$LIB_TQT ${kde_int_qt}_incremental"
break break
fi fi
done done
AC_SUBST(LIB_QT) AC_SUBST(LIB_TQT)
AC_SUBST(LIB_QPE) AC_SUBST(LIB_QPE)
AC_SUBST(kde_qtver) AC_SUBST(kde_qtver)
@ -2101,7 +2101,7 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else 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_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
@ -5443,8 +5443,8 @@ AC_DEFUN([AC_PATH_QTOPIA],
AC_MSG_CHECKING([for Qtopia]) AC_MSG_CHECKING([for Qtopia])
LIB_QTOPIA="-lqpe" LIB_TQTOPIA="-lqpe"
AC_SUBST(LIB_QTOPIA) AC_SUBST(LIB_TQTOPIA)
kde_qtopia_dirs="$QPEDIR /opt/Qtopia" kde_qtopia_dirs="$QPEDIR /opt/Qtopia"
@ -5491,7 +5491,7 @@ is required.])
CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes" CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes"
LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" 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 cat > conftest.$ac_ext <<EOF
#include "confdefs.h" #include "confdefs.h"

2
kftpgrabber/src/Makefile.am
Unescape View File

@ -49,7 +49,7 @@ kftpgrabber_LDADD = \
misc/interfaces/libkftpinterfaces.la \ misc/interfaces/libkftpinterfaces.la \
misc/libs/ssh/libssh.a \ misc/libs/ssh/libssh.a \
$(LIB_TDEDNSSD) -ltdewalletclient $(LIBSSL) $(LIB_TDEPARTS) \ $(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 # this is where the desktop file will go
xdg_apps_DATA = kftpgrabber.desktop xdg_apps_DATA = kftpgrabber.desktop

2
kftpgrabber/src/misc/interfaces/Makefile.am
Unescape View File

@ -9,7 +9,7 @@ METASOURCES = AUTO
lib_LTLIBRARIES = libkftpinterfaces.la lib_LTLIBRARIES = libkftpinterfaces.la
libkftpinterfaces_la_SOURCES = kftpbookmarkimportplugin.cpp libkftpinterfaces_la_SOURCES = kftpbookmarkimportplugin.cpp
libkftpinterfaces_la_LDFLAGS = $(all_libraries) -version-info 0:0:0 -no-undefined 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 kftpgrabberincludedir = $(includedir)/kftpgrabber
kftpgrabberinclude_HEADERS = kftpbookmarkimportplugin.h kftpgrabberinclude_HEADERS = kftpbookmarkimportplugin.h

2
kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/Makefile.am
Unescape View File

@ -6,7 +6,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = kftpimportplugin_filezilla3.la kde_module_LTLIBRARIES = kftpimportplugin_filezilla3.la
kftpimportplugin_filezilla3_la_SOURCES = kftpimportfz3plugin.cpp 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) kftpimportplugin_filezilla3_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
kde_services_DATA = kftpimportplugin_filezilla3.desktop kde_services_DATA = kftpimportplugin_filezilla3.desktop

2
kftpgrabber/src/misc/plugins/bookmarkimport/gftp/Makefile.am
Unescape View File

@ -6,7 +6,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = kftpimportplugin_gftp.la kde_module_LTLIBRARIES = kftpimportplugin_gftp.la
kftpimportplugin_gftp_la_SOURCES = kftpimportgftpplugin.cpp 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) kftpimportplugin_gftp_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
kde_services_DATA = kftpimportplugin_gftp.desktop kde_services_DATA = kftpimportplugin_gftp.desktop

2
kftpgrabber/src/misc/plugins/bookmarkimport/kftp/Makefile.am
Unescape View File

@ -6,7 +6,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = kftpimportplugin_kftp.la kde_module_LTLIBRARIES = kftpimportplugin_kftp.la
kftpimportplugin_kftp_la_SOURCES = kftpimportkftpplugin.cpp 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) kftpimportplugin_kftp_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
kde_services_DATA = kftpimportplugin_kftp.desktop kde_services_DATA = kftpimportplugin_kftp.desktop

2
kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/Makefile.am
Unescape View File

@ -6,7 +6,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = kftpimportplugin_ncftp.la kde_module_LTLIBRARIES = kftpimportplugin_ncftp.la
kftpimportplugin_ncftp_la_SOURCES = kftpimportncftpplugin.cpp 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) kftpimportplugin_ncftp_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
kde_services_DATA = kftpimportplugin_ncftp.desktop kde_services_DATA = kftpimportplugin_ncftp.desktop

Write Preview
Loading…
Cancel
Save