TDE
/
kmyfirewall
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kmyfirewall
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 3a06695166
commit 826ae54cf0
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
24 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File

2
KMFSysTray/Makefile.am
Unescape View File

@ -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

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)")
@ -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 <<EOF
#include "confdefs.h"

2
doc/Makefile
Unescape View File

@ -174,7 +174,7 @@ LIB_TDEUNITTEST = -ltdeunittest
LIB_TDEUTILS = -ltdeutils
LIB_POLL =
LIB_QPE =
LIB_QT = -lqt-mt $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread
LIB_TQT = -lqt-mt $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread
LIB_SMB = -lsmb
LIB_X11 = -lX11 $(LIBSOCKET)
LIB_XEXT = -lXext

2
doc/kmyfirewall/Makefile
Unescape View File

@ -158,7 +158,7 @@ LIB_TDEUNITTEST = -ltdeunittest
LIB_TDEUTILS = -ltdeutils
LIB_POLL =
LIB_QPE =
LIB_QT = -lqt-mt $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread
LIB_TQT = -lqt-mt $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread
LIB_SMB = -lsmb
LIB_X11 = -lX11 $(LIBSOCKET)
LIB_XEXT = -lXext

2
kmyfirewall/Makefile.am
Unescape View File

@ -11,7 +11,7 @@ METASOURCES = AUTO
#########################################################################
bin_PROGRAMS = kmyfirewall
kmyfirewall_SOURCES = kmfconfigdialog.cpp kmyfirewall.cpp main.cpp
kmyfirewall_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kmyfirewall_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kmyfirewall_LDADD = kmfwidgets/libkmfwidgets.la \
core/libkmfcore.la $(LIB_TDEPARTS)

2
kmyfirewall/compilers/iptables/Makefile.am
Unescape View File

@ -2,7 +2,7 @@ INCLUDES = $(all_includes) -I../../core -I../../kmfwidgets -I../../libkmfplugins
METASOURCES = AUTO
kde_module_LTLIBRARIES = libkmfcompiler_ipt.la
libkmfcompiler_ipt_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) \
$(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
$(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
libkmfcompiler_ipt_la_SOURCES = kmfiptablescompiler.cpp kmfiptablesscriptgenerator.cpp kmfiptablesdocumentconverter.cpp
libkmfcompiler_ipt_la_LIBADD = \
$(LIB_TDEPARTS) ../../kmfwidgets/libkmfwidgets.la ../../core/libkmfcore.la

2
kmyfirewall/core/Makefile.am
Unescape View File

@ -53,7 +53,7 @@ libkmfcore_la_SOURCES = ipaddress.cpp \
libkmfcoreincludedir = $(includedir)/kmyfirewall/core/
libkmfcore_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
libkmfcore_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEIO) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI)
libkmfcoreinclude_HEADERS = ipaddress.h \
iptable.h \

2
kmyfirewall/genericinterface/Makefile.am
Unescape View File

@ -6,7 +6,7 @@ partrcdir = $(kde_datadir)/kmfgenericinterfacepart
partrc_DATA = kmfgenericinterfacepartui.rc
libkmfgenericinterfacepart_la_LDFLAGS = -module -no-undefined $(all_libraries) \
$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
$(KDE_PLUGIN) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
libkmfgenericinterfacepart_la_LIBADD = \
$(LIB_TDEPARTS) ../kmfwidgets/libkmfwidgets.la ../core/libkmfcore.la

2
kmyfirewall/installer/Makefile.am
Unescape View File

@ -11,7 +11,7 @@ partdesktopdir = $(kde_servicetypesdir)
partdesktop_DATA = kmfinstallerplugin.desktop
libkmfinstallerplugin_la_LDFLAGS = -module -no-undefined $(all_libraries) \
$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
$(KDE_PLUGIN) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
libkmfinstallerplugin_la_SOURCES = kmfinstallerplugin.cpp
noinst_HEADERS = kmfinstallerplugin.h

2
kmyfirewall/installer/linux/Makefile.am
Unescape View File

@ -1,7 +1,7 @@
INCLUDES = $(all_includes) -I../../core -I../../kmfwidgets -I../../libkmfplugins
METASOURCES = AUTO
kde_module_LTLIBRARIES = libkmfinstaller_linux.la
libkmfinstaller_linux_la_LDFLAGS = -module -no-undefined $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(KDE_PLUGIN) \
libkmfinstaller_linux_la_LDFLAGS = -module -no-undefined $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(KDE_PLUGIN) \
$(all_libraries)
libkmfinstaller_linux_la_SOURCES = kmfiptinstaller.cpp
libkmfinstaller_linux_la_LIBADD = \

2
kmyfirewall/installer/openbsd/Makefile
Unescape View File

@ -212,7 +212,7 @@ LIB_TDEUNITTEST = -ltdeunittest
LIB_TDEUTILS = -ltdeutils
LIB_POLL =
LIB_QPE =
LIB_QT = -lqt-mt $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread
LIB_TQT = -lqt-mt $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread
LIB_SMB = -lsmb
LIB_X11 = -lX11 $(LIBSOCKET)
LIB_XEXT = -lXext

2
kmyfirewall/ipteditor/Makefile.am
Unescape View File

@ -21,7 +21,7 @@ libkmfipteditorpart_la_SOURCES = kmfchainedit.cpp kmfnewchaindlg.cpp kmfruleedit
noinst_HEADERS = kmfchainedit.h kmfnewchaindlg.h kmfruleedit.h kmfipteditorpart.h
libkmfipteditorpart_la_LDFLAGS = -module -no-undefined $(all_libraries) \
$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
$(KDE_PLUGIN) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
libkmfipteditorpart_la_LIBADD = \
$(LIB_TDEPARTS) ../kmfwidgets/libkmfwidgets.la ../core/libkmfcore.la

2
kmyfirewall/ruleoptionplugins/custom_option/Makefile.am
Unescape View File

@ -3,7 +3,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = libkmfruleoptionedit_custom.la
libkmfruleoptionedit_custom_la_LDFLAGS = -module -no-undefined $(all_libraries) \
$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
$(KDE_PLUGIN) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
libkmfruleoptionedit_custom_la_LIBADD = \
$(LIB_TDEPARTS) ../../core/libkmfcore.la
noinst_HEADERS = kmfruleoptioneditcustom.h kmfruleeditcustomopt.h

2
kmyfirewall/ruleoptionplugins/interface_option/Makefile.am
Unescape View File

@ -3,7 +3,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = libkmfruleoptionedit_interface.la
libkmfruleoptionedit_interface_la_LDFLAGS = -module -no-undefined \
$(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
$(all_libraries) $(KDE_PLUGIN) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
libkmfruleoptionedit_interface_la_LIBADD = \
$(LIB_TDEPARTS) ../../core/libkmfcore.la

2
kmyfirewall/ruleoptionplugins/ip_option/Makefile.am
Unescape View File

@ -3,7 +3,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = libkmfruleoptionedit_ip.la
libkmfruleoptionedit_ip_la_LDFLAGS = -module -no-undefined $(all_libraries) \
$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
$(KDE_PLUGIN) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
libkmfruleoptionedit_ip_la_LIBADD = \
../../core/libkmfcore.la $(LIB_TDEPARTS)
noinst_HEADERS = kmfruleoptioneditip.h kmfruleeditip.h

2
kmyfirewall/ruleoptionplugins/limit_option/Makefile.am
Unescape View File

@ -3,7 +3,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = libkmfruleoptionedit_limit.la
libkmfruleoptionedit_limit_la_LDFLAGS = -module -no-undefined $(all_libraries) \
$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
$(KDE_PLUGIN) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
libkmfruleoptionedit_limit_la_LIBADD = \
../../core/libkmfcore.la $(LIB_TDEPARTS)
noinst_HEADERS = kmfruleoptioneditlimit.h kmfruleeditorlimit.h

2
kmyfirewall/ruleoptionplugins/log_target_option/Makefile.am
Unescape View File

@ -3,7 +3,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = libkmfruletargetoptionedit_log.la
libkmfruletargetoptionedit_log_la_LDFLAGS = -module -no-undefined \
$(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
$(all_libraries) $(KDE_PLUGIN) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
libkmfruletargetoptionedit_log_la_LIBADD = \
../../core/libkmfcore.la $(LIB_TDEPARTS)
noinst_HEADERS = kmfruletargetoptioneditlog.h kmfruleedittargetlog.h

2
kmyfirewall/ruleoptionplugins/mac_option/Makefile.am
Unescape View File

@ -3,7 +3,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = libkmfruleoptionedit_mac.la
libkmfruleoptionedit_mac_la_LDFLAGS = -module -no-undefined $(all_libraries) \
$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
$(KDE_PLUGIN) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
libkmfruleoptionedit_mac_la_LIBADD = \
../../core/libkmfcore.la $(LIB_TDEPARTS)
noinst_HEADERS = kmfruleoptioneditmac.h kmfruleeditmac.h

2
kmyfirewall/ruleoptionplugins/mark_target_option/Makefile.am
Unescape View File

@ -3,7 +3,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = libkmfruletargetoptionedit_mark.la
libkmfruletargetoptionedit_mark_la_LDFLAGS = -module -no-undefined \
$(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
$(all_libraries) $(KDE_PLUGIN) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
libkmfruletargetoptionedit_mark_la_LIBADD = \
../../core/libkmfcore.la $(LIB_TDEPARTS)
noinst_HEADERS = kmfruletargetoptioneditmark.h kmfruleedittargetmark.h

2
kmyfirewall/ruleoptionplugins/nat_target_option/Makefile.am
Unescape View File

@ -3,7 +3,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = libkmfruletargetoptionedit_nat.la
libkmfruletargetoptionedit_nat_la_LDFLAGS = -module -no-undefined \
$(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
$(all_libraries) $(KDE_PLUGIN) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
libkmfruletargetoptionedit_nat_la_LIBADD = \
../../core/libkmfcore.la $(LIB_TDEPARTS)
noinst_HEADERS = kmfruletargetoptioneditnat.h kmfruleeditortargetnat.h

2
kmyfirewall/ruleoptionplugins/protocol_option/Makefile.am
Unescape View File

@ -3,7 +3,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = libkmfruleoptionedit_protocol.la
libkmfruleoptionedit_protocol_la_LDFLAGS = -module -no-undefined \
$(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
$(all_libraries) $(KDE_PLUGIN) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
libkmfruleoptionedit_protocol_la_LIBADD = \
../../kmfwidgets/libkmfwidgets.la ../../core/libkmfcore.la $(LIB_TDEPARTS)
noinst_HEADERS = kmfruleoptioneditprotocol.h kmfruleeditorprotocol.h

2
kmyfirewall/ruleoptionplugins/state_option/Makefile.am
Unescape View File

@ -3,7 +3,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = libkmfruleoptionedit_state.la
libkmfruleoptionedit_state_la_LDFLAGS = -module -no-undefined $(all_libraries) \
$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
$(KDE_PLUGIN) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
libkmfruleoptionedit_state_la_LIBADD = \
../../core/libkmfcore.la $(LIB_TDEPARTS)
noinst_HEADERS = kmfruleoptioneditstate.h kmfruleeditorstate.h

2
kmyfirewall/ruleoptionplugins/tos_option/Makefile.am
Unescape View File

@ -3,7 +3,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = libkmfruleoptionedit_tos.la
libkmfruleoptionedit_tos_la_LDFLAGS = -module -no-undefined $(all_libraries) \
$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
$(KDE_PLUGIN) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
libkmfruleoptionedit_tos_la_LIBADD = \
../../core/libkmfcore.la $(LIB_TDEPARTS)
noinst_HEADERS = kmfruleoptionedittos.h kmfruleeditortos.h

2
kmyfirewall/ruleoptionplugins/tos_target_option/Makefile.am
Unescape View File

@ -3,7 +3,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = libkmfruletargetoptionedit_tos.la
libkmfruletargetoptionedit_tos_la_LDFLAGS = -module -no-undefined \
$(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
$(all_libraries) $(KDE_PLUGIN) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
libkmfruletargetoptionedit_tos_la_LIBADD = \
../../core/libkmfcore.la $(LIB_TDEPARTS)
noinst_HEADERS = kmfruletargetoptionedittos.h kmfruleeditortos.h

Write Preview
Loading…
Cancel
Save