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
triggersdir = $(networkdir)/triggers
-logdir = $(localestatedir)/log/network
+logdir = $(localstatedir)/log/network
utildir = $(networkdir)
CLEANFILES =
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) \
dist_sbin_SCRIPTS = \
src/dhclient-script \
- src/firewall-config \
- src/firewall4 \
- src/firewall6 \
+ src/firewall \
src/network
network_DATA = \
dist_helpers_SCRIPTS = \
src/helpers/dhcpd-config-helper \
- src/helpers/firewall-kernel-init \
src/helpers/hostapd-config-helper \
src/helpers/ipsec-updown \
src/helpers/pppd-angel \
# ------------------------------------------------------------------------------
+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 \
# ------------------------------------------------------------------------------
if HAVE_SYSTEMD
-systemdsystemunit_DATA = \
- src/systemd/firewall4.service \
- src/systemd/firewall6.service \
+systemdsystemunit_DATA += \
+ src/systemd/firewall.service \
src/systemd/firewall-init.service \
src/systemd/network-init.service \
src/systemd/network@.service
endif
EXTRA_DIST += \
- src/systemd/firewall4.service.in \
- src/systemd/firewall6.service.in \
+ src/systemd/firewall.service.in \
src/systemd/firewall-init.service.in \
src/systemd/network-init.service.in \
src/systemd/network@.service.in
# ------------------------------------------------------------------------------
+dist_modprobe_DATA = \
+ src/modprobe.d/no-copybreak.conf
+
+# ------------------------------------------------------------------------------
+
dist_bashcompletion_SCRIPTS = \
src/bash-completion/network
MANPAGES = \
man/firewall-settings.8 \
man/network.8 \
- man/network-color.8 \
man/network-device.8 \
man/network-dhcp.8 \
man/network-dns-server.8 \
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 \
man/network-zone-pppoe.8 \
man/network-zone-wireless.8
+EXTRA_DIST += \
+ man/include-color.txt \
+ man/include-description.txt
+
MANPAGES_TXT = $(patsubst %.8,%.txt,$(MANPAGES))
-MANPAGES_HTML = $(patsubst %.txt,%.html,$(MANPAGES))
+MANPAGES_HTML = $(patsubst %.txt,%.html,$(MANPAGES_TXT))
+MANPAGES_XML = $(patsubst %.txt,%.xml,$(MANPAGES_TXT))
.PHONY: man
man: $(MANPAGES) $(MANPAGES_HTML)
+if ENABLE_MANPAGES
man_MANS = \
$(MANPAGES)
-
-noinst_DATA += \
- $(MANPAGES_HTML)
+endif
CLEANFILES += \
- $(man_MANS) \
- $(MANPAGES_HTML)
+ $(MANPAGES) \
+ $(MANPAGES_HTML) \
+ $(MANPAGES_XML)
EXTRA_DIST += \
+ man/asciidoc.conf \
$(MANPAGES_TXT)
XSLTPROC_FLAGS = \
--stringparam man.copyright.section.enabled 1
XSLTPROC_COMMAND_MAN = \
- $(AM_V_XSLT)$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) \
+ $(AM_V_XSLT)$(MKDIR_P) $(dir $@) && \
+ $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) \
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
man/%.xml: man/%.txt man/asciidoc.conf
- $(AM_V_ASCIIDOC)$(ASCIIDOC) \
- -f man/asciidoc.conf \
+ $(AM_V_ASCIIDOC)$(MKDIR_P) $(dir $@) && \
+ $(ASCIIDOC) \
+ -f $(abs_srcdir)/man/asciidoc.conf \
-d manpage -b docbook -o $@ $<
man/%.8: man/%.xml
$(XSLTPROC_COMMAND_MAN)
man/%.html: man/%.txt man/asciidoc.conf
- $(AM_V_ASCIIDOC)$(ASCIIDOC) \
- -f man/asciidoc.conf \
+ $(AM_V_ASCIIDOC)$(MKDIR_P) $(dir $@) && \
+ $(ASCIIDOC) \
+ -f $(abs_srcdir)/man/asciidoc.conf \
-b html5 -a icons -a theme=flask -o $@ $<
+.PHONY: upload-man
+upload-man: $(MANPAGES_HTML)
+ rsync -avHz --delete --progress $(MANPAGES_HTML) ms@people.ipfire.org:/pub/man-pages/$(PACKAGE_NAME)/
+
# ------------------------------------------------------------------------------
substitutions = \
'|builddir=$(abs_builddir)|' \
'|prefix=$(prefix)|' \
'|exec_prefix=$(exec_prefix)|' \
+ '|bindir=$(bindir)|' \
'|sbindir=$(sbindir)|' \
'|networkdir=$(networkdir)|' \
'|helpersdir=$(helpersdir)|' \
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 \
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
projects / people / ms / network.git / blobdiff