Repository : http://git.fedorahosted.org/cgit/firewalld-recode.git
On branch : master
commit b884331a44b8169000d9e20e5bbee65a3ad09f36 Author: Daniel Kopecek dkopecek@redhat.com Date: Fri Nov 21 11:24:05 2014 +0100
Makefile.am update
- split into static noinst sublibraries for future usage in unit tests - track all needed files for compiling the project - fixed make distcheck
Makefile.am | 222 ++++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 135 insertions(+), 87 deletions(-)
diff --git a/Makefile.am b/Makefile.am index 102d9e7..d1a210b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,38 @@ -noinst_LTLIBRARIES = libcommon.la +ACLOCAL_AMFLAGS= -I m4 + +LDADD=\ + @pthread_LIBS@ \ + @glibmm_LIBS@ + +AM_CPPFLAGS=\ + -I$(top_srcdir)/src \ + @pthread_CFLAGS@ \ + @glibmm_CFLAGS@ \ + @giomm_CFLAGS@ \ + @expat_CFLAGS@ + +EXTRA_DIST=\ + src/Daemon/Firewall/RichLanguageParser/Parser.c \ + src/Daemon/Firewall/RichLanguageParser/Parser.h \ + src/Daemon/Firewall/RichLanguageParser/quex \ + src/Daemon/DBusIntrospection.xmlcpp \ + src/Daemon/DBus/methods.decl \ + src/Daemon/DBus/zone/methods.decl \ + src/Daemon/DBus/direct/methods.decl \ + src/Daemon/DBus/policies/methods.decl + +noinst_LTLIBRARIES =\ + libcommon.la \ + libbackends.la \ + libfirewall.la \ + librichrules.la \ + libdbus_main.la \ + libdbus_zone.la \ + libdbus_direct.la + +sbin_PROGRAMS=\ + firewalld + libcommon_la_SOURCES=\ src/Common/Utility.cpp \ src/Common/XMLStorage.cpp \ @@ -8,19 +42,13 @@ libcommon_la_SOURCES=\ src/Common/Types.hpp \ src/Common/Logging.cpp \ src/Common/XMLStorage.hpp \ - src/Common/Utility.hpp - -libcommon_la_CPPFLAGS=\ - @pthread_CFLAGS@ \ - @glibmm_CFLAGS@ \ - @giomm_CFLAGS@ \ - @expat_CFLAGS@ \ - -I$(top_srcdir)/src + src/Common/Utility.hpp \ + src/ThirdParty/easylogging++.h
-sbin_PROGRAMS= firewalld +libcommon_la_LIBADD=\ + @expat_LIBS@
-firewalld_SOURCES=\ - src/Daemon/Exceptions.hpp \ +libbackends_la_SOURCES=\ src/Daemon/Backends/Linux/EBTables.cpp \ src/Daemon/Backends/Linux/EBTables.hpp \ src/Daemon/Backends/Linux/IPTables.cpp \ @@ -32,12 +60,78 @@ firewalld_SOURCES=\ src/Daemon/Backends/Linux/XTables.cpp \ src/Daemon/Backends/Linux/XTables.hpp \ src/Daemon/Backends/LinuxXTables.cpp \ - src/Daemon/Backends/LinuxXTables.hpp \ - src/Daemon/CLI.cpp \ - src/Daemon/CLI.hpp \ - src/Daemon/DBus.cpp \ - src/Daemon/DBus.hpp \ + src/Daemon/Backends/LinuxXTables.hpp + +libfirewall_la_SOURCES=\ + src/Daemon/Firewall/Backend.cpp \ + src/Daemon/Firewall/Backend.hpp \ + src/Daemon/Firewall/BackendOpTable.hpp \ + src/Daemon/Firewall/Firewall.cpp \ + src/Daemon/Firewall/Firewall.hpp \ + src/Daemon/Firewall/ICMPType.cpp \ + src/Daemon/Firewall/ICMPType.hpp \ + src/Daemon/Firewall/IPAddress.cpp \ + src/Daemon/Firewall/IPAddress.hpp \ + src/Daemon/Firewall/Interface.cpp \ + src/Daemon/Firewall/Interface.hpp \ + src/Daemon/Firewall/Port.cpp \ + src/Daemon/Firewall/Port.hpp \ + src/Daemon/Firewall/PortForward.cpp \ + src/Daemon/Firewall/PortForward.hpp \ + src/Daemon/Firewall/Service.cpp \ + src/Daemon/Firewall/Service.hpp \ + src/Daemon/Firewall/Source.cpp \ + src/Daemon/Firewall/Source.hpp \ + src/Daemon/Firewall/Transaction.cpp \ + src/Daemon/Firewall/Transaction.hpp \ + src/Daemon/Firewall/Zone.cpp \ + src/Daemon/Firewall/Zone.hpp + +libfirewall_la_LIBADD=\ + $(top_builddir)/libbackends.la + +librichrules_la_SOURCES=\ + src/Daemon/Firewall/RichLanguageParser/Lexer-configuration.hpp \ + src/Daemon/Firewall/RichLanguageParser/Lexer-token.hpp \ + src/Daemon/Firewall/RichLanguageParser/Lexer-token_ids.hpp \ + src/Daemon/Firewall/RichLanguageParser/Lexer.cpp \ + src/Daemon/Firewall/RichLanguageParser/Lexer.hpp \ + src/Daemon/Firewall/RichRule.cpp \ + src/Daemon/Firewall/RichRule.hpp \ + src/Daemon/Firewall/RichRuleParser.cpp \ + src/Daemon/Firewall/RichRuleParser.hpp \ + src/Daemon/Firewall/RichRules/ForwardPortRule.cpp \ + src/Daemon/Firewall/RichRules/ForwardPortRule.hpp \ + src/Daemon/Firewall/RichRules/ICMPBlockRule.cpp \ + src/Daemon/Firewall/RichRules/ICMPBlockRule.hpp \ + src/Daemon/Firewall/RichRules/MasqueradeRule.cpp \ + src/Daemon/Firewall/RichRules/MasqueradeRule.hpp \ + src/Daemon/Firewall/RichRules/PortRule.cpp \ + src/Daemon/Firewall/RichRules/PortRule.hpp \ + src/Daemon/Firewall/RichRules/ProtocolRule.cpp \ + src/Daemon/Firewall/RichRules/ProtocolRule.hpp \ + src/Daemon/Firewall/RichRules/ServiceRule.cpp \ + src/Daemon/Firewall/RichRules/ServiceRule.hpp + +librichrules_la_CPPFLAGS=\ + $(AM_CPPFLAGS) \ + -I$(top_srcdir)/src/Daemon/Firewall/RichLanguageParser + +libdbus_main_la_SOURCES=\ src/Daemon/DBus/completeReload.cpp \ + src/Daemon/DBus/disablePanicMode.cpp \ + src/Daemon/DBus/enablePanicMode.cpp \ + src/Daemon/DBus/getDefaultZone.cpp \ + src/Daemon/DBus/getIcmpTypeSettings.cpp \ + src/Daemon/DBus/getServiceSettings.cpp \ + src/Daemon/DBus/getZoneSettings.cpp \ + src/Daemon/DBus/listIcmpTypes.cpp \ + src/Daemon/DBus/listServices.cpp \ + src/Daemon/DBus/queryPanicMode.cpp \ + src/Daemon/DBus/reload.cpp \ + src/Daemon/DBus/setDefaultZone.cpp + +libdbus_direct_la_SOURCES=\ src/Daemon/DBus/direct/addChain.cpp \ src/Daemon/DBus/direct/addRule.cpp \ src/Daemon/DBus/direct/getAllChains.cpp \ @@ -49,18 +143,9 @@ firewalld_SOURCES=\ src/Daemon/DBus/direct/queryRule.cpp \ src/Daemon/DBus/direct/removeChain.cpp \ src/Daemon/DBus/direct/removeRule.cpp \ - src/Daemon/DBus/direct/removeRules.cpp \ - src/Daemon/DBus/disablePanicMode.cpp \ - src/Daemon/DBus/enablePanicMode.cpp \ - src/Daemon/DBus/getDefaultZone.cpp \ - src/Daemon/DBus/getIcmpTypeSettings.cpp \ - src/Daemon/DBus/getServiceSettings.cpp \ - src/Daemon/DBus/getZoneSettings.cpp \ - src/Daemon/DBus/listIcmpTypes.cpp \ - src/Daemon/DBus/listServices.cpp \ - src/Daemon/DBus/queryPanicMode.cpp \ - src/Daemon/DBus/reload.cpp \ - src/Daemon/DBus/setDefaultZone.cpp \ + src/Daemon/DBus/direct/removeRules.cpp + +libdbus_zone_la_SOURCES=\ src/Daemon/DBus/zone/addForwardPort.cpp \ src/Daemon/DBus/zone/addIcmpBlock.cpp \ src/Daemon/DBus/zone/addInterface.cpp \ @@ -99,51 +184,18 @@ firewalld_SOURCES=\ src/Daemon/DBus/zone/removePort.cpp \ src/Daemon/DBus/zone/removeRichRule.cpp \ src/Daemon/DBus/zone/removeService.cpp \ - src/Daemon/DBus/zone/removeSource.cpp \ - src/Daemon/Firewall/Backend.cpp \ - src/Daemon/Firewall/Backend.hpp \ - src/Daemon/Firewall/BackendOpTable.hpp \ - src/Daemon/Firewall/Firewall.cpp \ - src/Daemon/Firewall/Firewall.hpp \ - src/Daemon/Firewall/ICMPType.cpp \ - src/Daemon/Firewall/ICMPType.hpp \ - src/Daemon/Firewall/IPAddress.cpp \ - src/Daemon/Firewall/IPAddress.hpp \ - src/Daemon/Firewall/Interface.cpp \ - src/Daemon/Firewall/Interface.hpp \ - src/Daemon/Firewall/Port.cpp \ - src/Daemon/Firewall/Port.hpp \ - src/Daemon/Firewall/PortForward.cpp \ - src/Daemon/Firewall/PortForward.hpp \ - src/Daemon/Firewall/RichLanguageParser/Lexer-configuration.hpp \ - src/Daemon/Firewall/RichLanguageParser/Lexer-token.hpp \ - src/Daemon/Firewall/RichLanguageParser/Lexer-token_ids.hpp \ - src/Daemon/Firewall/RichLanguageParser/Lexer.cpp \ - src/Daemon/Firewall/RichLanguageParser/Lexer.hpp \ - src/Daemon/Firewall/RichRule.cpp \ - src/Daemon/Firewall/RichRule.hpp \ - src/Daemon/Firewall/RichRuleParser.cpp \ - src/Daemon/Firewall/RichRuleParser.hpp \ - src/Daemon/Firewall/RichRules/ForwardPortRule.cpp \ - src/Daemon/Firewall/RichRules/ForwardPortRule.hpp \ - src/Daemon/Firewall/RichRules/ICMPBlockRule.cpp \ - src/Daemon/Firewall/RichRules/ICMPBlockRule.hpp \ - src/Daemon/Firewall/RichRules/MasqueradeRule.cpp \ - src/Daemon/Firewall/RichRules/MasqueradeRule.hpp \ - src/Daemon/Firewall/RichRules/PortRule.cpp \ - src/Daemon/Firewall/RichRules/PortRule.hpp \ - src/Daemon/Firewall/RichRules/ProtocolRule.cpp \ - src/Daemon/Firewall/RichRules/ProtocolRule.hpp \ - src/Daemon/Firewall/RichRules/ServiceRule.cpp \ - src/Daemon/Firewall/RichRules/ServiceRule.hpp \ - src/Daemon/Firewall/Service.cpp \ - src/Daemon/Firewall/Service.hpp \ - src/Daemon/Firewall/Source.cpp \ - src/Daemon/Firewall/Source.hpp \ - src/Daemon/Firewall/Transaction.cpp \ - src/Daemon/Firewall/Transaction.hpp \ - src/Daemon/Firewall/Zone.cpp \ - src/Daemon/Firewall/Zone.hpp \ + src/Daemon/DBus/zone/removeSource.cpp + +libdbus_zone_la_LIBADD=\ + $(top_builddir)/librichrules.la \ + $(top_builddir)/libfirewall.la + +firewalld_SOURCES=\ + src/Daemon/Exceptions.hpp \ + src/Daemon/CLI.cpp \ + src/Daemon/CLI.hpp \ + src/Daemon/DBus.cpp \ + src/Daemon/DBus.hpp \ src/Daemon/FirewallD.cpp \ src/Daemon/FirewallD.hpp \ src/Daemon/GlobalVariables.hpp \ @@ -153,17 +205,13 @@ firewalld_SOURCES=\ src/Daemon/SignalHandler.hpp \ src/Daemon/main.cpp
-firewalld_CPPFLAGS=\ - @pthread_CFLAGS@ \ - @glibmm_CFLAGS@ \ - @giomm_CFLAGS@ \ - @expat_CFLAGS@ \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/Daemon/Firewall/RichLanguageParser - firewalld_LDADD=\ - $(top_builddir)/libcommon.la \ - @pthread_LIBS@ \ - @glibmm_LIBS@ \ - @giomm_LIBS@ \ - @expat_LIBS@ + $(top_builddir)/libcommon.la \ + $(top_builddir)/libbackends.la \ + $(top_builddir)/libfirewall.la \ + $(top_builddir)/librichrules.la \ + $(top_builddir)/libdbus_main.la \ + $(top_builddir)/libdbus_zone.la \ + $(top_builddir)/libdbus_direct.la \ + @pthread_LIBS@ \ + @giomm_LIBS@
firewalld-recode@lists.fedorahosted.org