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
INSTALL_EXEC_HOOKS =
UNINSTALL_EXEC_HOOKS =
noinst_DATA =
+network_PROGRAMS =
+dist_dbuspolicy_DATA =
+dist_dbussystembus_DATA =
+dist_polkitpolicy_DATA =
+systemdsystemunit_DATA =
AM_CPPFLAGS = \
$(OUR_CPPFLAGS) \
# ------------------------------------------------------------------------------
+AM_V_ASCIIDOC = $(AM_V_ASCIIDOC_$(V))
+AM_V_ASCIIDOC_ = $(AM_V_ASCIIDOC_$(AM_DEFAULT_VERBOSITY))
+AM_V_ASCIIDOC_0 = @echo " ASCIIDOC" $@;
+
AM_V_DOWNLOAD = $(AM_V_DOWNLOAD_$(V))
AM_V_DOWNLOAD_ = $(AM_V_DOWNLOAD_$(AM_DEFAULT_VERBOSITY))
AM_V_DOWNLOAD_0 = @echo " LOAD " $@;
dist_sbin_SCRIPTS = \
src/dhclient-script \
- src/firewall-config \
- src/firewall4 \
- src/firewall6 \
+ src/firewall \
src/network
network_DATA = \
dist_network_DATA = \
src/functions/functions.at \
src/functions/functions.auth \
+ src/functions/functions.bird \
src/functions/functions.bonding \
src/functions/functions.bridge \
src/functions/functions.cli \
src/functions/functions.ports \
src/functions/functions.ppp \
src/functions/functions.pppoe-server \
- src/functions/functions.radvd \
src/functions/functions.route \
src/functions/functions.routing \
src/functions/functions.serial \
src/functions/functions.wireless-networks \
src/functions/functions.wpa_supplicant \
src/functions/functions.zone \
- src/network-radvd-config \
src/header-config \
src/header-port \
src/header-zone
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 \
src/hooks/ports/bonding \
src/hooks/ports/dummy \
src/hooks/ports/ethernet \
+ src/hooks/ports/ip-tunnel \
src/hooks/ports/vlan \
src/hooks/ports/wireless-ap \
src/hooks/ports/wireless-mesh
# ------------------------------------------------------------------------------
+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/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-bus.c \
+ src/networkd/port-bus.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) \
+ $(SYSTEMD_CFLAGS)
+
+networkd_LDFLAGS = \
+ $(AM_LDFLAGS)
+
+networkd_LDADD = \
+ src/libnetwork.la \
+ $(CAP_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/main.c
+
+networkctl_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(SYSTEMD_CFLAGS)
+
+networkctl_LDFLAGS = \
+ $(AM_LDFLAGS)
+
+networkctl_LDADD = \
+ $(SYSTEMD_LIBS)
+
+# ------------------------------------------------------------------------------
+
util_PROGRAMS = \
+ src/utils/network-phy-list-channels \
+ src/utils/network-phy-list-ciphers \
src/utils/network-phy-list-ht-caps \
src/utils/network-phy-list-vht-caps
+src_utils_network_phy_list_channels_SOURCES = \
+ src/utils/network-phy-list-channels.c
+
+src_utils_network_phy_list_channels_LDADD = \
+ src/libnetwork.la
+
+src_utils_network_phy_list_ciphers_SOURCES = \
+ src/utils/network-phy-list-ciphers.c
+
+src_utils_network_phy_list_ciphers_LDADD = \
+ src/libnetwork.la
+
src_utils_network_phy_list_ht_caps_SOURCES = \
src/utils/network-phy-list-ht-caps.c
# ------------------------------------------------------------------------------
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-description.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
-MANPAGES_XML = $(patsubst %.8,%.xml,$(MANPAGES))
-MANPAGES_HTML = $(patsubst %.xml,%.html,$(MANPAGES_XML))
+EXTRA_DIST += \
+ man/include-color.txt \
+ man/include-description.txt
+
+MANPAGES_TXT = $(patsubst %.8,%.txt,$(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 += \
- $(MANPAGES_XML) \
- man/custom-html.xsl
+ man/asciidoc.conf \
+ $(MANPAGES_TXT)
XSLTPROC_FLAGS = \
--nonet \
--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 $<
-XSLTPROC_COMMAND_HTML = \
- $(AM_V_XSLT)$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $<
+man/%.xml: man/%.txt 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/%.xml man/custom-html.xsl
- $(XSLTPROC_COMMAND_HTML)
+man/%.html: man/%.txt 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)/
# ------------------------------------------------------------------------------
'|builddir=$(abs_builddir)|' \
'|prefix=$(prefix)|' \
'|exec_prefix=$(exec_prefix)|' \
+ '|bindir=$(bindir)|' \
'|sbindir=$(sbindir)|' \
'|networkdir=$(networkdir)|' \
'|helpersdir=$(helpersdir)|' \