summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2018-09-17 23:20:10 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2018-09-17 23:20:10 +0900
commit964a326f0609dc205d832be9db2d9a8e903cc252 (patch)
treece274fd8b7be98e73198742dbb6822880c59c704
parent3ad1d1e1f926fe602ac36c05ae813937be35c54e (diff)
downloadkatapult-964a326f0609dc205d832be9db2d9a8e903cc252.zip
katapult-964a326f0609dc205d832be9db2d9a8e903cc252.tar.gz
LIB_QT -> LIB_TQT conversion to align to updated admin module
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--acinclude.m418
-rw-r--r--katapult/common/Makefile.am2
-rw-r--r--katapult/katapult/Makefile.am4
-rw-r--r--katapult/plugins/catalogs/amarokcatalog/Makefile.am2
-rw-r--r--katapult/plugins/catalogs/bookmarkcatalog/Makefile.am2
-rw-r--r--katapult/plugins/catalogs/calculatorcatalog/Makefile.am2
-rw-r--r--katapult/plugins/catalogs/documentcatalog/Makefile.am2
-rw-r--r--katapult/plugins/catalogs/execcatalog/Makefile.am2
-rw-r--r--katapult/plugins/catalogs/googlecatalog/Makefile.am2
-rw-r--r--katapult/plugins/catalogs/programcatalog/Makefile.am2
-rw-r--r--katapult/plugins/catalogs/spellcatalog/Makefile.am2
-rw-r--r--katapult/plugins/display/glassdisplay/Makefile.am2
-rw-r--r--katapult/plugins/display/o2display/Makefile.am2
-rw-r--r--katapult/plugins/display/puredisplay/Makefile.am2
14 files changed, 23 insertions, 23 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index ab58883..cbd5b24 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)
@@ -2092,7 +2092,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)")
@@ -5434,8 +5434,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"
@@ -5482,7 +5482,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/katapult/common/Makefile.am b/katapult/common/Makefile.am
index 2096d11..e93ce6d 100644
--- a/katapult/common/Makefile.am
+++ b/katapult/common/Makefile.am
@@ -13,7 +13,7 @@ lib_LTLIBRARIES = libkatapult.la
# 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_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
kde_servicetypes_DATA = katapultdisplay.desktop katapultcatalog.desktop
diff --git a/katapult/katapult/Makefile.am b/katapult/katapult/Makefile.am
index 7f8ae50..f4b63e8 100644
--- a/katapult/katapult/Makefile.am
+++ b/katapult/katapult/Makefile.am
@@ -16,8 +16,8 @@ bin_PROGRAMS = katapult
# the application source, library search path, and link libraries
katapult_SOURCES = confgeneral.ui confcatalogs.ui confdisplay.ui main.cpp \
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_LDADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la
+katapult_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+katapult_LDADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la
# this is where the desktop file will go
xdg_apps_DATA = katapult.desktop
diff --git a/katapult/plugins/catalogs/amarokcatalog/Makefile.am b/katapult/plugins/catalogs/amarokcatalog/Makefile.am
index 73fc545..f0d83b4 100644
--- a/katapult/plugins/catalogs/amarokcatalog/Makefile.am
+++ b/katapult/plugins/catalogs/amarokcatalog/Makefile.am
@@ -11,5 +11,5 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = katapult_amarokcatalog.la
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_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
diff --git a/katapult/plugins/catalogs/bookmarkcatalog/Makefile.am b/katapult/plugins/catalogs/bookmarkcatalog/Makefile.am
index 4b555bb..b05912a 100644
--- a/katapult/plugins/catalogs/bookmarkcatalog/Makefile.am
+++ b/katapult/plugins/catalogs/bookmarkcatalog/Makefile.am
@@ -13,5 +13,5 @@ kde_module_LTLIBRARIES = katapult_bookmarkcatalog.la
katapult_bookmarkcatalog_la_SOURCES = settings.ui bookmarkcatalog.cpp \
bookmark.cpp actionopenbookmark.cpp mozillabookmark.cpp
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
diff --git a/katapult/plugins/catalogs/calculatorcatalog/Makefile.am b/katapult/plugins/catalogs/calculatorcatalog/Makefile.am
index e8c46b8..2439bd2 100644
--- a/katapult/plugins/catalogs/calculatorcatalog/Makefile.am
+++ b/katapult/plugins/catalogs/calculatorcatalog/Makefile.am
@@ -16,5 +16,5 @@ KDE_ICON = xcalc checkmark no
kde_module_LTLIBRARIES = katapult_calculatorcatalog.la
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_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
diff --git a/katapult/plugins/catalogs/documentcatalog/Makefile.am b/katapult/plugins/catalogs/documentcatalog/Makefile.am
index e242742..93eafc1 100644
--- a/katapult/plugins/catalogs/documentcatalog/Makefile.am
+++ b/katapult/plugins/catalogs/documentcatalog/Makefile.am
@@ -12,5 +12,5 @@ kde_module_LTLIBRARIES = katapult_documentcatalog.la
katapult_documentcatalog_la_SOURCES = settings.ui documentcatalog.cpp \
directory.cpp document.cpp actionopendocument.cpp
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
diff --git a/katapult/plugins/catalogs/execcatalog/Makefile.am b/katapult/plugins/catalogs/execcatalog/Makefile.am
index 1c792ba..acfcf86 100644
--- a/katapult/plugins/catalogs/execcatalog/Makefile.am
+++ b/katapult/plugins/catalogs/execcatalog/Makefile.am
@@ -16,5 +16,5 @@ KDE_ICON = AUTO
kde_module_LTLIBRARIES = katapult_execcatalog.la
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_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
diff --git a/katapult/plugins/catalogs/googlecatalog/Makefile.am b/katapult/plugins/catalogs/googlecatalog/Makefile.am
index 4a8e3d9..af34cb0 100644
--- a/katapult/plugins/catalogs/googlecatalog/Makefile.am
+++ b/katapult/plugins/catalogs/googlecatalog/Makefile.am
@@ -16,5 +16,5 @@ KDE_ICON = AUTO
kde_module_LTLIBRARIES = katapult_googlecatalog.la
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_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
diff --git a/katapult/plugins/catalogs/programcatalog/Makefile.am b/katapult/plugins/catalogs/programcatalog/Makefile.am
index 19b5b0e..4ec9ab8 100644
--- a/katapult/plugins/catalogs/programcatalog/Makefile.am
+++ b/katapult/plugins/catalogs/programcatalog/Makefile.am
@@ -8,7 +8,7 @@ noinst_HEADERS = programcatalog.h program.h actionrunprogram.h
kde_module_LTLIBRARIES = katapult_programcatalog.la
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_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
# use automoc
diff --git a/katapult/plugins/catalogs/spellcatalog/Makefile.am b/katapult/plugins/catalogs/spellcatalog/Makefile.am
index 98cd5cd..7dc8aba 100644
--- a/katapult/plugins/catalogs/spellcatalog/Makefile.am
+++ b/katapult/plugins/catalogs/spellcatalog/Makefile.am
@@ -15,5 +15,5 @@ KDE_ICON = AUTO
kde_module_LTLIBRARIES = katapult_spellcatalog.la
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_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
diff --git a/katapult/plugins/display/glassdisplay/Makefile.am b/katapult/plugins/display/glassdisplay/Makefile.am
index 37dd7cd..e26a971 100644
--- a/katapult/plugins/display/glassdisplay/Makefile.am
+++ b/katapult/plugins/display/glassdisplay/Makefile.am
@@ -11,5 +11,5 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = katapult_glassdisplay.la
katapult_glassdisplay_la_SOURCES = glassdisplay.cpp
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
diff --git a/katapult/plugins/display/o2display/Makefile.am b/katapult/plugins/display/o2display/Makefile.am
index 742dd8f..93a67b7 100644
--- a/katapult/plugins/display/o2display/Makefile.am
+++ b/katapult/plugins/display/o2display/Makefile.am
@@ -11,5 +11,5 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = katapult_o2display.la
katapult_o2display_la_SOURCES = o2display.cpp
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
diff --git a/katapult/plugins/display/puredisplay/Makefile.am b/katapult/plugins/display/puredisplay/Makefile.am
index 3ebe6ab..019b810 100644
--- a/katapult/plugins/display/puredisplay/Makefile.am
+++ b/katapult/plugins/display/puredisplay/Makefile.am
@@ -11,5 +11,5 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = katapult_puredisplay.la
katapult_puredisplay_la_SOURCES = puredisplay.cpp
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