TDE
/
katapult
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/katapult
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 3ad1d1e1f9
commit 964a326f06
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
14 changed files with 23 additions and 23 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)
@ -2092,7 +2092,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_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
@ -5434,8 +5434,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"
@ -5482,7 +5482,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
katapult/common/Makefile.am
Unescape View File

@ -13,7 +13,7 @@ lib_LTLIBRARIES = libkatapult.la
# common library # common library
libkatapult_la_SOURCES = katapultitem.cpp katapultaction.cpp actionregistry.cpp katapultcatalog.cpp cachedcatalog.cpp match.cpp katapultdisplay.cpp imagedisplay.cpp imagedisplaysettings.ui libkatapult_la_SOURCES = katapultitem.cpp katapultaction.cpp actionregistry.cpp katapultcatalog.cpp cachedcatalog.cpp match.cpp katapultdisplay.cpp imagedisplay.cpp imagedisplaysettings.ui
libkatapult_la_LDFLAGS = $(all_libraries) -version-info 2:0:0 libkatapult_la_LDFLAGS = $(all_libraries) -version-info 2:0:0
libkatapult_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) -lDCOP -ltdefx $(LIB_TDEUI) libkatapult_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) -lDCOP -ltdefx $(LIB_TDEUI)
# this is where the service type files will go # this is where the service type files will go
kde_servicetypes_DATA = katapultdisplay.desktop katapultcatalog.desktop kde_servicetypes_DATA = katapultdisplay.desktop katapultcatalog.desktop

4
katapult/katapult/Makefile.am
Unescape View File

@ -16,8 +16,8 @@ bin_PROGRAMS = katapult
# the application source, library search path, and link libraries # the application source, library search path, and link libraries
katapult_SOURCES = confgeneral.ui confcatalogs.ui confdisplay.ui main.cpp \ katapult_SOURCES = confgeneral.ui confcatalogs.ui confdisplay.ui main.cpp \
katapult.cpp katapultsettings.cpp katapultconfigdlg.cpp katapultiface.skel katapult.cpp katapultsettings.cpp katapultconfigdlg.cpp katapultiface.skel
katapult_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor katapult_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
katapult_LDADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la katapult_LDADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la
# this is where the desktop file will go # this is where the desktop file will go
xdg_apps_DATA = katapult.desktop xdg_apps_DATA = katapult.desktop

2
katapult/plugins/catalogs/amarokcatalog/Makefile.am
Unescape View File

@ -11,5 +11,5 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = katapult_amarokcatalog.la kde_module_LTLIBRARIES = katapult_amarokcatalog.la
katapult_amarokcatalog_la_SOURCES = settings.ui amarokcatalog.cpp coverimage.cpp song.cpp actionplaysong.cpp katapult_amarokcatalog_la_SOURCES = settings.ui amarokcatalog.cpp coverimage.cpp song.cpp actionplaysong.cpp
katapult_amarokcatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries) katapult_amarokcatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)
katapult_amarokcatalog_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) -lDCOP $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la katapult_amarokcatalog_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) -lDCOP $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la
kde_services_DATA = katapult_amarokcatalog.desktop kde_services_DATA = katapult_amarokcatalog.desktop

2
katapult/plugins/catalogs/bookmarkcatalog/Makefile.am
Unescape View File

@ -13,5 +13,5 @@ kde_module_LTLIBRARIES = katapult_bookmarkcatalog.la
katapult_bookmarkcatalog_la_SOURCES = settings.ui bookmarkcatalog.cpp \ katapult_bookmarkcatalog_la_SOURCES = settings.ui bookmarkcatalog.cpp \
bookmark.cpp actionopenbookmark.cpp mozillabookmark.cpp bookmark.cpp actionopenbookmark.cpp mozillabookmark.cpp
katapult_bookmarkcatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries) katapult_bookmarkcatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)
katapult_bookmarkcatalog_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la katapult_bookmarkcatalog_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la
kde_services_DATA = katapult_bookmarkcatalog.desktop kde_services_DATA = katapult_bookmarkcatalog.desktop

2
katapult/plugins/catalogs/calculatorcatalog/Makefile.am
Unescape View File

@ -16,5 +16,5 @@ KDE_ICON = xcalc checkmark no
kde_module_LTLIBRARIES = katapult_calculatorcatalog.la kde_module_LTLIBRARIES = katapult_calculatorcatalog.la
katapult_calculatorcatalog_la_SOURCES = settings.ui calculatorcatalog.cpp expression.cpp actionevalexpr.cpp parser.cpp katapult_calculatorcatalog_la_SOURCES = settings.ui calculatorcatalog.cpp expression.cpp actionevalexpr.cpp parser.cpp
katapult_calculatorcatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries) katapult_calculatorcatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)
katapult_calculatorcatalog_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la katapult_calculatorcatalog_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la
kde_services_DATA = katapult_calculatorcatalog.desktop kde_services_DATA = katapult_calculatorcatalog.desktop

2
katapult/plugins/catalogs/documentcatalog/Makefile.am
Unescape View File

@ -12,5 +12,5 @@ kde_module_LTLIBRARIES = katapult_documentcatalog.la
katapult_documentcatalog_la_SOURCES = settings.ui documentcatalog.cpp \ katapult_documentcatalog_la_SOURCES = settings.ui documentcatalog.cpp \
directory.cpp document.cpp actionopendocument.cpp directory.cpp document.cpp actionopendocument.cpp
katapult_documentcatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries) katapult_documentcatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)
katapult_documentcatalog_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la katapult_documentcatalog_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la
kde_services_DATA = katapult_documentcatalog.desktop kde_services_DATA = katapult_documentcatalog.desktop

2
katapult/plugins/catalogs/execcatalog/Makefile.am
Unescape View File

@ -16,5 +16,5 @@ KDE_ICON = AUTO
kde_module_LTLIBRARIES = katapult_execcatalog.la kde_module_LTLIBRARIES = katapult_execcatalog.la
katapult_execcatalog_la_SOURCES = settings.ui execcatalog.cpp command.cpp actionrun.cpp katapult_execcatalog_la_SOURCES = settings.ui execcatalog.cpp command.cpp actionrun.cpp
katapult_execcatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries) katapult_execcatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)
katapult_execcatalog_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la katapult_execcatalog_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la
kde_services_DATA = katapult_execcatalog.desktop kde_services_DATA = katapult_execcatalog.desktop

2
katapult/plugins/catalogs/googlecatalog/Makefile.am
Unescape View File

@ -16,5 +16,5 @@ KDE_ICON = AUTO
kde_module_LTLIBRARIES = katapult_googlecatalog.la kde_module_LTLIBRARIES = katapult_googlecatalog.la
katapult_googlecatalog_la_SOURCES = settings.ui googlecatalog.cpp query.cpp actionsearch.cpp katapult_googlecatalog_la_SOURCES = settings.ui googlecatalog.cpp query.cpp actionsearch.cpp
katapult_googlecatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries) katapult_googlecatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)
katapult_googlecatalog_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la katapult_googlecatalog_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la
kde_services_DATA = katapult_googlecatalog.desktop kde_services_DATA = katapult_googlecatalog.desktop

2
katapult/plugins/catalogs/programcatalog/Makefile.am
Unescape View File

@ -8,7 +8,7 @@ noinst_HEADERS = programcatalog.h program.h actionrunprogram.h
kde_module_LTLIBRARIES = katapult_programcatalog.la kde_module_LTLIBRARIES = katapult_programcatalog.la
katapult_programcatalog_la_SOURCES = settings.ui programcatalog.cpp program.cpp actionrunprogram.cpp katapult_programcatalog_la_SOURCES = settings.ui programcatalog.cpp program.cpp actionrunprogram.cpp
katapult_programcatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries) katapult_programcatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)
katapult_programcatalog_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la katapult_programcatalog_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la
kde_services_DATA = katapult_programcatalog.desktop kde_services_DATA = katapult_programcatalog.desktop
# use automoc # use automoc

2
katapult/plugins/catalogs/spellcatalog/Makefile.am
Unescape View File

@ -15,5 +15,5 @@ KDE_ICON = AUTO
kde_module_LTLIBRARIES = katapult_spellcatalog.la kde_module_LTLIBRARIES = katapult_spellcatalog.la
katapult_spellcatalog_la_SOURCES = settings.ui spellcatalog.cpp spelling.cpp actioncopyspelling.cpp katapult_spellcatalog_la_SOURCES = settings.ui spellcatalog.cpp spelling.cpp actioncopyspelling.cpp
katapult_spellcatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries) katapult_spellcatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)
katapult_spellcatalog_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la katapult_spellcatalog_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la
kde_services_DATA = katapult_spellcatalog.desktop kde_services_DATA = katapult_spellcatalog.desktop

2
katapult/plugins/display/glassdisplay/Makefile.am
Unescape View File

@ -11,5 +11,5 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = katapult_glassdisplay.la kde_module_LTLIBRARIES = katapult_glassdisplay.la
katapult_glassdisplay_la_SOURCES = glassdisplay.cpp katapult_glassdisplay_la_SOURCES = glassdisplay.cpp
katapult_glassdisplay_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries) katapult_glassdisplay_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)
katapult_glassdisplay_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(top_builddir)/katapult/common/libkatapult.la katapult_glassdisplay_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(top_builddir)/katapult/common/libkatapult.la
kde_services_DATA = katapult_glassdisplay.desktop kde_services_DATA = katapult_glassdisplay.desktop

2
katapult/plugins/display/o2display/Makefile.am
Unescape View File

@ -11,5 +11,5 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = katapult_o2display.la kde_module_LTLIBRARIES = katapult_o2display.la
katapult_o2display_la_SOURCES = o2display.cpp katapult_o2display_la_SOURCES = o2display.cpp
katapult_o2display_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries) katapult_o2display_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)
katapult_o2display_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(top_builddir)/katapult/common/libkatapult.la katapult_o2display_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(top_builddir)/katapult/common/libkatapult.la
kde_services_DATA = katapult_o2display.desktop kde_services_DATA = katapult_o2display.desktop

2
katapult/plugins/display/puredisplay/Makefile.am
Unescape View File

@ -11,5 +11,5 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = katapult_puredisplay.la kde_module_LTLIBRARIES = katapult_puredisplay.la
katapult_puredisplay_la_SOURCES = puredisplay.cpp katapult_puredisplay_la_SOURCES = puredisplay.cpp
katapult_puredisplay_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries) katapult_puredisplay_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)
katapult_puredisplay_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(top_builddir)/katapult/common/libkatapult.la katapult_puredisplay_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(top_builddir)/katapult/common/libkatapult.la
kde_services_DATA = katapult_puredisplay.desktop kde_services_DATA = katapult_puredisplay.desktop

Write Preview
Loading…
Cancel
Save