From 826ae54cf0790e7056beb4f99d10dbc205655756 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 17 Sep 2018 23:20:22 +0900 Subject: [PATCH] LIB_QT -> LIB_TQT conversion to align to updated admin module Signed-off-by: Michele Calgaro --- KMFSysTray/Makefile.am | 2 +- acinclude.m4 | 18 +++++++++--------- doc/Makefile | 2 +- doc/kmyfirewall/Makefile | 2 +- kmyfirewall/Makefile.am | 2 +- kmyfirewall/compilers/iptables/Makefile.am | 2 +- kmyfirewall/core/Makefile.am | 2 +- kmyfirewall/genericinterface/Makefile.am | 2 +- kmyfirewall/installer/Makefile.am | 2 +- kmyfirewall/installer/linux/Makefile.am | 2 +- kmyfirewall/installer/openbsd/Makefile | 2 +- kmyfirewall/ipteditor/Makefile.am | 2 +- .../custom_option/Makefile.am | 2 +- .../interface_option/Makefile.am | 2 +- .../ruleoptionplugins/ip_option/Makefile.am | 2 +- .../ruleoptionplugins/limit_option/Makefile.am | 2 +- .../log_target_option/Makefile.am | 2 +- .../ruleoptionplugins/mac_option/Makefile.am | 2 +- .../mark_target_option/Makefile.am | 2 +- .../nat_target_option/Makefile.am | 2 +- .../protocol_option/Makefile.am | 2 +- .../ruleoptionplugins/state_option/Makefile.am | 2 +- .../ruleoptionplugins/tos_option/Makefile.am | 2 +- .../tos_target_option/Makefile.am | 2 +- 24 files changed, 32 insertions(+), 32 deletions(-) diff --git a/KMFSysTray/Makefile.am b/KMFSysTray/Makefile.am index 4331dd3..3cfa7da 100644 --- a/KMFSysTray/Makefile.am +++ b/KMFSysTray/Makefile.am @@ -7,7 +7,7 @@ bin_PROGRAMS = kmfsystray -kmfsystray_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kmfsystray_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kmfsystray_LDADD = ../kmyfirewall/core/libkmfcore.la ../kmyfirewall/kmfwidgets/libkmfwidgets.la $(LIB_TDEUI) $(LIB_TDEPARTS) kmfsystray_DATA = kmfsystray.desktop diff --git a/acinclude.m4 b/acinclude.m4 index 439ecf1..f91605b 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)") @@ -5443,8 +5443,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" @@ -5491,7 +5491,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 <