X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fnetwork.git;a=blobdiff_plain;f=Makefile.am;h=a5ea1235c7b8a774ead5ce3c0ec6aa800ef037e2;hp=78da25f51a89a94a6d3fc01e35c253dd56f1db8e;hb=HEAD;hpb=b41f1f866ef816e6ea7dd9e23e11e36a588ed611 diff --git a/Makefile.am b/Makefile.am index 78da25f5..7ca12292 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,6 +31,7 @@ AUTOMAKE_OPTIONS = color-tests configdir = $(sysconfdir)/network bashcompletiondir= $(datadir)/bash-completion/completions libexecdir = $(prefix)/lib +modprobedir = $(prefix)/lib/modprobe.d pkgconfigdir = $(libdir)/pkgconfig pppdir = $(sysconfdir)/ppp systemconfigdir = $(datadir)/network @@ -50,7 +51,7 @@ hooks_zonesdir = $(hooksdir)/zones triggersdir = $(networkdir)/triggers -logdir = $(localestatedir)/log/network +logdir = $(localstatedir)/log/network utildir = $(networkdir) CLEANFILES = @@ -58,8 +59,14 @@ DISTCLEANFILES = EXTRA_DIST = INSTALL_DIRS = INSTALL_EXEC_HOOKS = +TESTS = UNINSTALL_EXEC_HOOKS = noinst_DATA = +network_PROGRAMS = +dist_dbuspolicy_DATA = +dist_dbussystembus_DATA = +dist_polkitpolicy_DATA = +systemdsystemunit_DATA = AM_CPPFLAGS = \ $(OUR_CPPFLAGS) \ @@ -298,6 +305,124 @@ EXTRA_DIST += \ # ------------------------------------------------------------------------------ +network_PROGRAMS += \ + networkd + +dist_networkd_SOURCES = \ + src/networkd/address.h \ + src/networkd/bus.c \ + src/networkd/bus.h \ + src/networkd/config.c \ + src/networkd/config.h \ + src/networkd/daemon.c \ + src/networkd/daemon.h \ + src/networkd/daemon-bus.c \ + src/networkd/daemon-bus.h \ + src/networkd/devmon.c \ + src/networkd/devmon.h \ + src/networkd/json.h \ + src/networkd/link.c \ + src/networkd/link.h \ + src/networkd/links.c \ + src/networkd/links.h \ + src/networkd/logging.c \ + src/networkd/logging.h \ + src/networkd/main.c \ + src/networkd/ports.c \ + src/networkd/ports.h \ + src/networkd/port.c \ + src/networkd/port.h \ + src/networkd/port-bonding.c \ + src/networkd/port-bonding.h \ + src/networkd/port-bus.c \ + src/networkd/port-bus.h \ + src/networkd/port-dummy.c \ + src/networkd/port-dummy.h \ + src/networkd/port-ethernet.c \ + src/networkd/port-ethernet.h \ + src/networkd/port-veth.c \ + src/networkd/port-veth.h \ + src/networkd/port-vlan.c \ + src/networkd/port-vlan.h \ + src/networkd/stats-collector.c \ + src/networkd/stats-collector.h \ + src/networkd/string.h \ + src/networkd/util.c \ + src/networkd/util.h \ + src/networkd/zones.c \ + src/networkd/zones.h \ + src/networkd/zone.c \ + src/networkd/zone.h \ + src/networkd/zone-bus.c \ + src/networkd/zone-bus.h + +networkd_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -DCONFIG_DIR="\"$(configdir)\"" + +networkd_CFLAGS = \ + $(AM_CFLAGS) \ + $(CAP_CFLAGS) \ + $(JSON_C_CFLAGS) \ + $(SYSTEMD_CFLAGS) + +networkd_LDFLAGS = \ + $(AM_LDFLAGS) + +networkd_LDADD = \ + src/libnetwork.la \ + $(CAP_LIBS) \ + $(JSON_C_LIBS) \ + $(SYSTEMD_LIBS) + +dist_dbuspolicy_DATA += \ + src/networkd/org.ipfire.network1.conf + +dist_dbussystembus_DATA += \ + src/networkd/org.ipfire.network1.service + +dist_polkitpolicy_DATA += \ + src/networkd/org.ipfire.network1.policy + +systemdsystemunit_DATA += \ + src/networkd/networkd.service + +EXTRA_DIST += \ + src/networkd/networkd.service.in + +CLEANFILES += \ + src/networkd/networkd.service + +# ------------------------------------------------------------------------------ + +bin_PROGRAMS += \ + networkctl + +dist_networkctl_SOURCES = \ + src/networkctl/command.c \ + src/networkctl/command.h \ + src/networkctl/main.c \ + src/networkctl/port.c \ + src/networkctl/port.h \ + src/networkctl/terminal.c \ + src/networkctl/terminal.h \ + src/networkctl/zone.c \ + src/networkctl/zone.h + +networkctl_CFLAGS = \ + $(AM_CFLAGS) \ + $(JSON_C_CFLAGS) \ + $(SYSTEMD_CFLAGS) + +networkctl_LDFLAGS = \ + $(AM_LDFLAGS) + +networkctl_LDADD = \ + $(JSON_C_LIBS) \ + $(SYSTEMD_LIBS) + +# ------------------------------------------------------------------------------ + util_PROGRAMS = \ src/utils/network-phy-list-channels \ src/utils/network-phy-list-ciphers \ @@ -360,7 +485,7 @@ UNINSTALL_EXEC_HOOKS += ppp-uninstall-hook # ------------------------------------------------------------------------------ if HAVE_SYSTEMD -systemdsystemunit_DATA = \ +systemdsystemunit_DATA += \ src/systemd/firewall.service \ src/systemd/firewall-init.service \ src/systemd/network-init.service \ @@ -396,6 +521,11 @@ dist_sysctl_DATA = \ # ------------------------------------------------------------------------------ +dist_modprobe_DATA = \ + src/modprobe.d/no-copybreak.conf + +# ------------------------------------------------------------------------------ + dist_bashcompletion_SCRIPTS = \ src/bash-completion/network @@ -460,6 +590,7 @@ MANPAGES = \ man/network-route-static.8 \ man/network-settings.8 \ man/network-vpn.8 \ + man/network-vpn-ipsec.8 \ man/network-vpn-security-policies.8 \ man/network-zone.8 \ man/network-zone-bridge.8 \ @@ -480,11 +611,13 @@ MANPAGES_XML = $(patsubst %.txt,%.xml,$(MANPAGES_TXT)) .PHONY: man man: $(MANPAGES) $(MANPAGES_HTML) +if ENABLE_MANPAGES man_MANS = \ $(MANPAGES) +endif CLEANFILES += \ - $(man_MANS) \ + $(MANPAGES) \ $(MANPAGES_HTML) \ $(MANPAGES_XML) @@ -533,6 +666,7 @@ substitutions = \ '|builddir=$(abs_builddir)|' \ '|prefix=$(prefix)|' \ '|exec_prefix=$(exec_prefix)|' \ + '|bindir=$(bindir)|' \ '|sbindir=$(sbindir)|' \ '|networkdir=$(networkdir)|' \ '|helpersdir=$(helpersdir)|' \ @@ -565,12 +699,10 @@ TESTS_ENVIRONMENT = \ dist_check_DATA = \ test/constants.sh \ - test/test-functions + test/test-functions \ + test/networkd/test.sh dist_check_SCRIPTS = \ - $(TESTS) - -TESTS = \ test/load-library \ test/functions/ip/ip_detect_protocol \ test/functions/ip/ip_get_prefix \ @@ -581,6 +713,24 @@ TESTS = \ test/functions/ip/ip_protocol_is_supported \ test/functions/ip/ip_split_prefix +TESTS += $(dist_check_SCRIPTS) + +TEST_EXTENSIONS = .t + +NETWORKD_TESTS = \ + test/networkd/00_launch.t \ + test/networkd/01_dummy.t + +TESTS += $(NETWORKD_TESTS) + +EXTRA_DIST += \ + test/networkd/test.sh \ + $(NETWORKD_TESTS) + +# Run all networkd tests in their own namespaces +T_LOG_COMPILER = unshare --net --ipc --uts --user --cgroup --time --pid --fork \ + --map-root-user --keep-caps $(SHELL) test/networkd/test.sh + # - NITSI tests ---------------------------------------------------------------- # Files for the virtual environment