summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2018-09-17 23:20:31 +0900
committerMichele Calgaro <[email protected]>2018-09-17 23:20:31 +0900
commitaaceac54adb296f12cfd25639d00d9ba21d1bdaf (patch)
tree6da2587fa47e09a1d2d205c6fed9a1215d3ecf95
parent9390cdb668b2ba0f84db48646973dcc8af420fcf (diff)
downloadkrusader-aaceac54adb296f12cfd25639d00d9ba21d1bdaf.tar.gz
krusader-aaceac54adb296f12cfd25639d00d9ba21d1bdaf.zip
LIB_QT -> LIB_TQT conversion to align to updated admin module
Signed-off-by: Michele Calgaro <[email protected]>
-rw-r--r--acinclude.m418
-rw-r--r--iso/Makefile.am2
-rw-r--r--krArc/Makefile.am4
-rw-r--r--krusader.kdevprj2
-rw-r--r--krusader/Makefile.am4
-rw-r--r--tar/Makefile.am2
-rw-r--r--virt/Makefile.am4
7 files changed, 18 insertions, 18 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 29534f6..bbbb70c 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_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"
diff --git a/iso/Makefile.am b/iso/Makefile.am
index 83783d8..7cb0fdd 100644
--- a/iso/Makefile.am
+++ b/iso/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES = $(all_includes)
tdeio_iso_la_METASOURCES=AUTO
tdeio_iso_la_SOURCES = kisodirectory.cpp kisofile.cpp qfilehack.cpp kiso.cpp iso.cpp
-tdeio_iso_la_LIBADD = libisofs/libisofs.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO)
+tdeio_iso_la_LIBADD = libisofs/libisofs.la $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEIO)
tdeio_iso_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
diff --git a/krArc/Makefile.am b/krArc/Makefile.am
index df0d0f4..3dde0f3 100644
--- a/krArc/Makefile.am
+++ b/krArc/Makefile.am
@@ -10,8 +10,8 @@ INCLUDES = $(all_includes)
tdeio_krarc_la_METASOURCES=AUTO
tdeio_krarc_la_SOURCES = krarc.cpp
-tdeio_krarc_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO)
-# $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+tdeio_krarc_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEIO)
+# $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT)
tdeio_krarc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
diff --git a/krusader.kdevprj b/krusader.kdevprj
index d10d7b5..e00c976 100644
--- a/krusader.kdevprj
+++ b/krusader.kdevprj
@@ -22,7 +22,7 @@ bin_program=krusader
cflags=-DKDE_NO_COMPAT -D_LARGEFILE64_SOURCE
cppflags=-DKDE_NO_COMPAT -D_LARGEFILE64_SOURCE
cxxflags=\s-O0 -Wall
-ldadd=UserMenu/libUserMenu.a VFS/libVFS.a KViewer/libKViewer.a Dialogs/libDialogs.a BookMan/libBookMan.a GUI/libGUI.a $(LIB_TDEPARTS) $(LIB_TDEFILE) $(LIB_TDEHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+ldadd=UserMenu/libUserMenu.a VFS/libVFS.a KViewer/libKViewer.a Dialogs/libDialogs.a BookMan/libBookMan.a GUI/libGUI.a $(LIB_TDEPARTS) $(LIB_TDEFILE) $(LIB_TDEHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT)
ldflags=\s \s
[General]
diff --git a/krusader/Makefile.am b/krusader/Makefile.am
index d06a63c..963cdcf 100644
--- a/krusader/Makefile.am
+++ b/krusader/Makefile.am
@@ -100,7 +100,7 @@ krusader_LDADD = \
$(LIB_TDEHTML) \
$(LIB_TDEUI) \
$(LIB_TDECORE) \
- $(LIB_QT) \
+ $(LIB_TQT) \
$(LIBSOCKET) \
-ltdefx \
-ltdeutils \
@@ -108,7 +108,7 @@ krusader_LDADD = \
# the library search path.
-krusader_LDFLAGS = $(all_libraries) $(kde_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdewalletclient
+krusader_LDFLAGS = $(all_libraries) $(kde_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdewalletclient
###########################################################
diff --git a/tar/Makefile.am b/tar/Makefile.am
index 4d2ed23..b6180d9 100644
--- a/tar/Makefile.am
+++ b/tar/Makefile.am
@@ -1,7 +1,7 @@
## Makefile.am of tdebase/tdeioslave/tar
INCLUDES = $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
METASOURCES = AUTO
kde_module_LTLIBRARIES = tdeio_tar.la
diff --git a/virt/Makefile.am b/virt/Makefile.am
index c099846..706e2f0 100644
--- a/virt/Makefile.am
+++ b/virt/Makefile.am
@@ -1,14 +1,14 @@
## Makefile.am of tdebase/tdeioslave/tar
INCLUDES = $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
METASOURCES = AUTO
kde_module_LTLIBRARIES = tdeio_virt.la
tdeio_virt_la_SOURCES = virt.cc
tdeio_virt_la_LIBADD = $(LIB_TDESYCOCA)
-tdeio_virt_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE)
+tdeio_virt_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) $(LIB_TDECORE)
noinst_HEADERS = virt.h