TDE
/
smb4k
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/smb4k
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 2b80944703
commit 62f0273dc0
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
10 changed files with 19 additions and 19 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
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_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
@ -5442,8 +5442,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"
@ -5490,7 +5490,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"

2
plugin/Makefile.am
Unescape View File

@ -5,7 +5,7 @@ konqsidebar_smb4k_la_SOURCES = smb4k_konqplugin.cpp
konqsidebar_smb4k_la_LDFLAGS = -module $(all_libraries) \
-L$(top_builddir)/smb4k/core -L$(topbuild_dir)/smb4k/widgets -lkonqsidebarplugin
konqsidebar_smb4k_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
$(KDE_PLUGIN) $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_QT) $(LIB_TDECORE) \
$(KDE_PLUGIN) $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_TQT) $(LIB_TDECORE) \
$(LIB_TDEUI)
globaladddir = $(kde_datadir)/konqsidebartng/add

4
smb4k/Makefile.am
Unescape View File

@ -8,8 +8,8 @@ bin_PROGRAMS = smb4k
smb4k_SOURCES = main.cpp smb4k.cpp smb4ksystemtray.cpp
smb4k_LDADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
$(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_QT)
smb4k_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
$(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_TQT)
smb4k_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
KDE_ICON = smb4k

2
smb4k/browser/Makefile.am
Unescape View File

@ -8,7 +8,7 @@ libsmb4knetworkbrowser_la_SOURCES = smb4knetworkbrowser_part.cpp \
smb4knetworkbrowsertooltip.cpp
libsmb4knetworkbrowser_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
$(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDECORE) \
$(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_TDEPARTS) $(LIB_QT)
$(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_TDEPARTS) $(LIB_TQT)
libsmb4knetworkbrowser_la_LDFLAGS = -module -no-undefined $(all_libraries)
partrcdir = $(kde_datadir)/smb4knetworkbrowserpart

2
smb4k/configdlg/Makefile.am
Unescape View File

@ -8,5 +8,5 @@ libsmb4tdeconfigdialog_la_SOURCES = smb4kauthoptions.cpp smb4tdeconfigdialog.cpp
smb4knetworkoptions.cpp smb4tdersyncoptions.cpp smb4ksambaoptions.cpp smb4kshareoptions.cpp \
smb4ksuperuseroptions.cpp smb4kuserinterfaceoptions.cpp
libsmb4tdeconfigdialog_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
$(LIB_TDECORE) $(LIB_TDEUI) $(LIB_QT)
$(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TQT)
libsmb4tdeconfigdialog_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TDECORE) $(LIB_TDEFILE)

2
smb4k/core/Makefile.am
Unescape View File

@ -18,7 +18,7 @@ libsmb4kcore_la_SOURCES = smb4kauthinfo.cpp smb4kbookmark.cpp \
smb4kprint.cpp smb4kprintinfo.cpp smb4ksambaoptionshandler.cpp \
smb4ksambaoptionsinfo.cpp smb4kscanner.cpp smb4kscanner_p.cpp smb4ksettings.kcfgc smb4kshare.cpp \
smb4ksynchronizationinfo.cpp smb4ksynchronizer.cpp
libsmb4kcore_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_QT)
libsmb4kcore_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TQT)
kde_kcfg_DATA = smb4k.kcfg

2
smb4k/dialogs/Makefile.am
Unescape View File

@ -6,6 +6,6 @@ libsmb4kdialogs_la_SOURCES = smb4kbookmarkeditor.cpp \
smb4kcustomoptionsdialog.cpp smb4kmountdialog.cpp smb4kpreviewdialog.cpp smb4kprintdialog.cpp \
smb4ksynchronizationdialog.cpp
libsmb4kdialogs_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
$(LIB_TDECORE) $(LIB_TDEUI) $(LIB_QT)
$(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TQT)
noinst_HEADERS = smb4kbookmarkeditor.h smb4kmountdialog.h smb4kpreviewdialog.h \
smb4kprintdialog.h smb4ksynchronizationdialog.h

2
smb4k/iconview/Makefile.am
Unescape View File

@ -10,7 +10,7 @@ noinst_HEADERS = smb4ksharesiconview.h smb4ksharesiconview_part.h \
smb4ksharesiconviewitem.h smb4ksharesiconviewtooltip.h
libsmb4ksharesiconview_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
$(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDEIO) $(LIB_TDECORE) $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_TDEPARTS) \
$(LIB_QT)
$(LIB_TQT)
partrcdir = $(kde_datadir)/smb4ksharesiconviewpart
partrc_DATA = smb4ksharesiconview_part.rc

2
smb4k/listview/Makefile.am
Unescape View File

@ -4,7 +4,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = libsmb4kshareslistview.la
libsmb4kshareslistview_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
$(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDEIO) $(LIB_TDECORE) $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_TDEPARTS) \
$(LIB_QT)
$(LIB_TQT)
libsmb4kshareslistview_la_LDFLAGS = -module -no-undefined $(all_libraries)
partrcdir = $(kde_datadir)/smb4kshareslistviewpart

2
smb4k/searchdlg/Makefile.am
Unescape View File

@ -2,7 +2,7 @@ INCLUDES = $(all_includes)
METASOURCES = AUTO
kde_module_LTLIBRARIES = libsmb4ksearchdialog.la
libsmb4ksearchdialog_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
$(LIB_TDECORE) $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_TDEPARTS) $(LIB_QT)
$(LIB_TDECORE) $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_TDEPARTS) $(LIB_TQT)
noinst_HEADERS = smb4ksearchdialog.h smb4ksearchdialog_part.h \
smb4ksearchdialogitem.h
libsmb4ksearchdialog_la_SOURCES = smb4ksearchdialog.cpp \

Write Preview
Loading…
Cancel
Save