From abae22ab5ae24dd8b1775ca70fbb8818abe33c5f Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 17 Feb 2010 02:18:24 +0000 Subject: [PATCH] Automake fixes git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kmyfirewall@1091578 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kmyfirewall/compilers/iptables/Makefile.am | 2 +- kmyfirewall/genericinterface/Makefile.am | 2 +- kmyfirewall/installer/Makefile.am | 2 +- kmyfirewall/installer/linux/Makefile.am | 2 +- kmyfirewall/ipteditor/Makefile.am | 2 +- kmyfirewall/kmfwidgets/Makefile.am | 2 +- kmyfirewall/ruleoptionplugins/custom_option/Makefile.am | 2 +- kmyfirewall/ruleoptionplugins/interface_option/Makefile.am | 2 +- kmyfirewall/ruleoptionplugins/ip_option/Makefile.am | 2 +- kmyfirewall/ruleoptionplugins/limit_option/Makefile.am | 2 +- kmyfirewall/ruleoptionplugins/log_target_option/Makefile.am | 2 +- kmyfirewall/ruleoptionplugins/mac_option/Makefile.am | 2 +- kmyfirewall/ruleoptionplugins/mark_target_option/Makefile.am | 2 +- kmyfirewall/ruleoptionplugins/nat_target_option/Makefile.am | 2 +- kmyfirewall/ruleoptionplugins/protocol_option/Makefile.am | 2 +- kmyfirewall/ruleoptionplugins/state_option/Makefile.am | 2 +- kmyfirewall/ruleoptionplugins/tos_option/Makefile.am | 2 +- kmyfirewall/ruleoptionplugins/tos_target_option/Makefile.am | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/kmyfirewall/compilers/iptables/Makefile.am b/kmyfirewall/compilers/iptables/Makefile.am index b0e864d..169b4de 100644 --- a/kmyfirewall/compilers/iptables/Makefile.am +++ b/kmyfirewall/compilers/iptables/Makefile.am @@ -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) + $(all_libraries) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) libkmfcompiler_ipt_la_SOURCES = kmfiptablescompiler.cpp kmfiptablesscriptgenerator.cpp kmfiptablesdocumentconverter.cpp libkmfcompiler_ipt_la_LIBADD = \ $(LIB_KPARTS) ../../kmfwidgets/libkmfwidgets.la ../../core/libkmfcore.la diff --git a/kmyfirewall/genericinterface/Makefile.am b/kmyfirewall/genericinterface/Makefile.am index df0dc7e..cf8d3cc 100644 --- a/kmyfirewall/genericinterface/Makefile.am +++ b/kmyfirewall/genericinterface/Makefile.am @@ -6,7 +6,7 @@ partrcdir = $(kde_datadir)/kmfgenericinterfacepart partrc_DATA = kmfgenericinterfacepartui.rc libkmfgenericinterfacepart_la_LDFLAGS = -module -no-undefined $(all_libraries) \ - $(KDE_PLUGIN) + $(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) libkmfgenericinterfacepart_la_LIBADD = \ $(LIB_KPARTS) ../kmfwidgets/libkmfwidgets.la ../core/libkmfcore.la diff --git a/kmyfirewall/installer/Makefile.am b/kmyfirewall/installer/Makefile.am index a212845..40f1772 100644 --- a/kmyfirewall/installer/Makefile.am +++ b/kmyfirewall/installer/Makefile.am @@ -11,7 +11,7 @@ partdesktopdir = $(kde_servicetypesdir) partdesktop_DATA = kmfinstallerplugin.desktop libkmfinstallerplugin_la_LDFLAGS = -module -no-undefined $(all_libraries) \ - $(KDE_PLUGIN) + $(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) libkmfinstallerplugin_la_SOURCES = kmfinstallerplugin.cpp noinst_HEADERS = kmfinstallerplugin.h diff --git a/kmyfirewall/installer/linux/Makefile.am b/kmyfirewall/installer/linux/Makefile.am index 2858f0c..74de5de 100644 --- a/kmyfirewall/installer/linux/Makefile.am +++ b/kmyfirewall/installer/linux/Makefile.am @@ -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 $(KDE_PLUGIN) \ +libkmfinstaller_linux_la_LDFLAGS = -module -no-undefined $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(KDE_PLUGIN) \ $(all_libraries) libkmfinstaller_linux_la_SOURCES = kmfiptinstaller.cpp libkmfinstaller_linux_la_LIBADD = \ diff --git a/kmyfirewall/ipteditor/Makefile.am b/kmyfirewall/ipteditor/Makefile.am index 3c83753..e20ee6b 100644 --- a/kmyfirewall/ipteditor/Makefile.am +++ b/kmyfirewall/ipteditor/Makefile.am @@ -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) + $(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) libkmfipteditorpart_la_LIBADD = \ $(LIB_KPARTS) ../kmfwidgets/libkmfwidgets.la ../core/libkmfcore.la diff --git a/kmyfirewall/kmfwidgets/Makefile.am b/kmyfirewall/kmfwidgets/Makefile.am index c06a44c..0b88aea 100644 --- a/kmyfirewall/kmfwidgets/Makefile.am +++ b/kmyfirewall/kmfwidgets/Makefile.am @@ -28,7 +28,7 @@ libkmfwidgetsincludedir = $(includedir)/kmyfirewall/kmfwidgets/ libkmfwidgetsinclude_HEADERS = kmfprocout.h kmflistview.h kmflistviewitem.h \ kmfmultiportwidget.h kmfportwidget.h kmfchecklistoutput.h kmfnewdocdlg.h kmfchecklistitem.h \ - kmfmainwindow.h kmfnetworkwidget.h kmfiptdocoptions.h kmfiptdocoptions.h \ + kmfmainwindow.h kmfnetworkwidget.h kmfiptdocoptions.h \ kmfobjectinfo.h kmyfirewallselectinterface.h noinst_HEADERS = kmfdocumentinfo.h kmfhostwidget.h kmfinterfacewidget.h \ diff --git a/kmyfirewall/ruleoptionplugins/custom_option/Makefile.am b/kmyfirewall/ruleoptionplugins/custom_option/Makefile.am index a03180e..a0eba35 100644 --- a/kmyfirewall/ruleoptionplugins/custom_option/Makefile.am +++ b/kmyfirewall/ruleoptionplugins/custom_option/Makefile.am @@ -3,7 +3,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libkmfruleoptionedit_custom.la libkmfruleoptionedit_custom_la_LDFLAGS = -module -no-undefined $(all_libraries) \ - $(KDE_PLUGIN) + $(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) libkmfruleoptionedit_custom_la_LIBADD = \ $(LIB_KPARTS) ../../core/libkmfcore.la noinst_HEADERS = kmfruleoptioneditcustom.h kmfruleeditcustomopt.h diff --git a/kmyfirewall/ruleoptionplugins/interface_option/Makefile.am b/kmyfirewall/ruleoptionplugins/interface_option/Makefile.am index 5a7900c..b6121d6 100644 --- a/kmyfirewall/ruleoptionplugins/interface_option/Makefile.am +++ b/kmyfirewall/ruleoptionplugins/interface_option/Makefile.am @@ -3,7 +3,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libkmfruleoptionedit_interface.la libkmfruleoptionedit_interface_la_LDFLAGS = -module -no-undefined \ - $(all_libraries) $(KDE_PLUGIN) + $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) libkmfruleoptionedit_interface_la_LIBADD = \ $(LIB_KPARTS) ../../core/libkmfcore.la diff --git a/kmyfirewall/ruleoptionplugins/ip_option/Makefile.am b/kmyfirewall/ruleoptionplugins/ip_option/Makefile.am index 4a84c9d..936cea2 100644 --- a/kmyfirewall/ruleoptionplugins/ip_option/Makefile.am +++ b/kmyfirewall/ruleoptionplugins/ip_option/Makefile.am @@ -3,7 +3,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libkmfruleoptionedit_ip.la libkmfruleoptionedit_ip_la_LDFLAGS = -module -no-undefined $(all_libraries) \ - $(KDE_PLUGIN) + $(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) libkmfruleoptionedit_ip_la_LIBADD = \ ../../core/libkmfcore.la $(LIB_KPARTS) noinst_HEADERS = kmfruleoptioneditip.h kmfruleeditip.h diff --git a/kmyfirewall/ruleoptionplugins/limit_option/Makefile.am b/kmyfirewall/ruleoptionplugins/limit_option/Makefile.am index 43a5e59..257d4fd 100644 --- a/kmyfirewall/ruleoptionplugins/limit_option/Makefile.am +++ b/kmyfirewall/ruleoptionplugins/limit_option/Makefile.am @@ -3,7 +3,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libkmfruleoptionedit_limit.la libkmfruleoptionedit_limit_la_LDFLAGS = -module -no-undefined $(all_libraries) \ - $(KDE_PLUGIN) + $(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) libkmfruleoptionedit_limit_la_LIBADD = \ ../../core/libkmfcore.la $(LIB_KPARTS) noinst_HEADERS = kmfruleoptioneditlimit.h kmfruleeditorlimit.h diff --git a/kmyfirewall/ruleoptionplugins/log_target_option/Makefile.am b/kmyfirewall/ruleoptionplugins/log_target_option/Makefile.am index c407197..9450892 100644 --- a/kmyfirewall/ruleoptionplugins/log_target_option/Makefile.am +++ b/kmyfirewall/ruleoptionplugins/log_target_option/Makefile.am @@ -3,7 +3,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libkmfruletargetoptionedit_log.la libkmfruletargetoptionedit_log_la_LDFLAGS = -module -no-undefined \ - $(all_libraries) $(KDE_PLUGIN) + $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) libkmfruletargetoptionedit_log_la_LIBADD = \ ../../core/libkmfcore.la $(LIB_KPARTS) noinst_HEADERS = kmfruletargetoptioneditlog.h kmfruleedittargetlog.h diff --git a/kmyfirewall/ruleoptionplugins/mac_option/Makefile.am b/kmyfirewall/ruleoptionplugins/mac_option/Makefile.am index 4faae53..65352da 100644 --- a/kmyfirewall/ruleoptionplugins/mac_option/Makefile.am +++ b/kmyfirewall/ruleoptionplugins/mac_option/Makefile.am @@ -3,7 +3,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libkmfruleoptionedit_mac.la libkmfruleoptionedit_mac_la_LDFLAGS = -module -no-undefined $(all_libraries) \ - $(KDE_PLUGIN) + $(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) libkmfruleoptionedit_mac_la_LIBADD = \ ../../core/libkmfcore.la $(LIB_KPARTS) noinst_HEADERS = kmfruleoptioneditmac.h kmfruleeditmac.h diff --git a/kmyfirewall/ruleoptionplugins/mark_target_option/Makefile.am b/kmyfirewall/ruleoptionplugins/mark_target_option/Makefile.am index f6878e2..2cb6aa6 100644 --- a/kmyfirewall/ruleoptionplugins/mark_target_option/Makefile.am +++ b/kmyfirewall/ruleoptionplugins/mark_target_option/Makefile.am @@ -3,7 +3,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libkmfruletargetoptionedit_mark.la libkmfruletargetoptionedit_mark_la_LDFLAGS = -module -no-undefined \ - $(all_libraries) $(KDE_PLUGIN) + $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) libkmfruletargetoptionedit_mark_la_LIBADD = \ ../../core/libkmfcore.la $(LIB_KPARTS) noinst_HEADERS = kmfruletargetoptioneditmark.h kmfruleedittargetmark.h diff --git a/kmyfirewall/ruleoptionplugins/nat_target_option/Makefile.am b/kmyfirewall/ruleoptionplugins/nat_target_option/Makefile.am index 38b0bd9..2a4b82b 100644 --- a/kmyfirewall/ruleoptionplugins/nat_target_option/Makefile.am +++ b/kmyfirewall/ruleoptionplugins/nat_target_option/Makefile.am @@ -3,7 +3,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libkmfruletargetoptionedit_nat.la libkmfruletargetoptionedit_nat_la_LDFLAGS = -module -no-undefined \ - $(all_libraries) $(KDE_PLUGIN) + $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) libkmfruletargetoptionedit_nat_la_LIBADD = \ ../../core/libkmfcore.la $(LIB_KPARTS) noinst_HEADERS = kmfruletargetoptioneditnat.h kmfruleeditortargetnat.h diff --git a/kmyfirewall/ruleoptionplugins/protocol_option/Makefile.am b/kmyfirewall/ruleoptionplugins/protocol_option/Makefile.am index 29e8dcc..44816c0 100644 --- a/kmyfirewall/ruleoptionplugins/protocol_option/Makefile.am +++ b/kmyfirewall/ruleoptionplugins/protocol_option/Makefile.am @@ -3,7 +3,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libkmfruleoptionedit_protocol.la libkmfruleoptionedit_protocol_la_LDFLAGS = -module -no-undefined \ - $(all_libraries) $(KDE_PLUGIN) + $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) libkmfruleoptionedit_protocol_la_LIBADD = \ ../../kmfwidgets/libkmfwidgets.la ../../core/libkmfcore.la $(LIB_KPARTS) noinst_HEADERS = kmfruleoptioneditprotocol.h kmfruleeditorprotocol.h diff --git a/kmyfirewall/ruleoptionplugins/state_option/Makefile.am b/kmyfirewall/ruleoptionplugins/state_option/Makefile.am index 962ac40..ea78f78 100644 --- a/kmyfirewall/ruleoptionplugins/state_option/Makefile.am +++ b/kmyfirewall/ruleoptionplugins/state_option/Makefile.am @@ -3,7 +3,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libkmfruleoptionedit_state.la libkmfruleoptionedit_state_la_LDFLAGS = -module -no-undefined $(all_libraries) \ - $(KDE_PLUGIN) + $(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) libkmfruleoptionedit_state_la_LIBADD = \ ../../core/libkmfcore.la $(LIB_KPARTS) noinst_HEADERS = kmfruleoptioneditstate.h kmfruleeditorstate.h diff --git a/kmyfirewall/ruleoptionplugins/tos_option/Makefile.am b/kmyfirewall/ruleoptionplugins/tos_option/Makefile.am index 8aa8361..d8a246e 100644 --- a/kmyfirewall/ruleoptionplugins/tos_option/Makefile.am +++ b/kmyfirewall/ruleoptionplugins/tos_option/Makefile.am @@ -3,7 +3,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libkmfruleoptionedit_tos.la libkmfruleoptionedit_tos_la_LDFLAGS = -module -no-undefined $(all_libraries) \ - $(KDE_PLUGIN) + $(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) libkmfruleoptionedit_tos_la_LIBADD = \ ../../core/libkmfcore.la $(LIB_KPARTS) noinst_HEADERS = kmfruleoptionedittos.h kmfruleeditortos.h diff --git a/kmyfirewall/ruleoptionplugins/tos_target_option/Makefile.am b/kmyfirewall/ruleoptionplugins/tos_target_option/Makefile.am index 3bd6a4d..beebf15 100644 --- a/kmyfirewall/ruleoptionplugins/tos_target_option/Makefile.am +++ b/kmyfirewall/ruleoptionplugins/tos_target_option/Makefile.am @@ -3,7 +3,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libkmfruletargetoptionedit_tos.la libkmfruletargetoptionedit_tos_la_LDFLAGS = -module -no-undefined \ - $(all_libraries) $(KDE_PLUGIN) + $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) libkmfruletargetoptionedit_tos_la_LIBADD = \ ../../core/libkmfcore.la $(LIB_KPARTS) noinst_HEADERS = kmfruletargetoptionedittos.h kmfruleeditortos.h