]> git.ipfire.org Git - people/ms/network.git/blobdiff - Makefile.am
Makefile: Remove any excess substitution rules
[people/ms/network.git] / Makefile.am
index ce9b9e2a018fbd8f2337697b006677bbbca23be0..73c79f501f99b63234ef2c5aa8788adbd8c10d3d 100644 (file)
@@ -28,9 +28,10 @@ AUTOMAKE_OPTIONS = color-tests
 # keep itermediate files
 .SECONDARY:
 
+configdir        = $(sysconfdir)/network
 bashcompletiondir= $(datadir)/bash-completion/completions
 libexecdir       = $(prefix)/lib
-pkgconfigdatadir = $(datadir)/pkgconfig
+pkgconfigdir     = $(libdir)/pkgconfig
 pppdir           = $(sysconfdir)/ppp
 systemconfigdir  = $(datadir)/network
 sysctldir        = $(prefix)/lib/sysctl.d
@@ -50,6 +51,7 @@ hooks_zonesdir   = $(hooksdir)/zones
 triggersdir      = $(networkdir)/triggers
 
 logdir           = $(localestatedir)/log/network
+utildir          = $(networkdir)
 
 CLEANFILES =
 DISTCLEANFILES =
@@ -59,9 +61,21 @@ INSTALL_EXEC_HOOKS =
 UNINSTALL_EXEC_HOOKS =
 noinst_DATA =
 
-AM_CFLAGS       = $(OUR_CFLAGS)
-AM_CPPFLAGS     = $(OUR_CPPFLAGS)
-AM_LDFLAGS      = $(OUR_LDFLAGS)
+AM_CPPFLAGS = \
+       $(OUR_CPPFLAGS) \
+       -include $(top_builddir)/config.h \
+       -I${top_srcdir}/src/libnetwork
+
+AM_CFLAGS = \
+       $(OUR_CFLAGS) \
+       -fvisibility=hidden \
+       -ffunction-sections \
+       -fdata-sections
+
+AM_LDFLAGS = \
+       $(OUR_LDFLAGS) \
+       -Wl,--gc-sections \
+       -Wl,--as-needed
 
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) \
@@ -75,6 +89,10 @@ INSTALL_EXEC_HOOKS += \
 
 # ------------------------------------------------------------------------------
 
+AM_V_NITSI   = $(AM_V_NITSI_$(V))
+AM_V_NITSI_  = $(AM_V_NITSI_$(AM_DEFAULT_VERBOSITY))
+AM_V_NITSI_0 = @echo "  NITSI   " $@;
+
 AM_V_XSLT   = $(AM_V_XSLT_$(V))
 AM_V_XSLT_  = $(AM_V_XSLT_$(AM_DEFAULT_VERBOSITY))
 AM_V_XSLT_0 = @echo "  XSLT    " $@;
@@ -93,7 +111,7 @@ dist_sbin_SCRIPTS = \
        src/firewall6 \
        src/network
 
-network_SCRIPTS = \
+network_DATA = \
        src/functions/functions
 
 CLEANFILES += \
@@ -102,10 +120,9 @@ CLEANFILES += \
 EXTRA_DIST += \
        src/functions/functions.in
 
-dist_network_SCRIPTS = \
+dist_network_DATA = \
        src/functions/functions.at \
        src/functions/functions.auth \
-       src/functions/functions.batman-adv \
        src/functions/functions.bonding \
        src/functions/functions.bridge \
        src/functions/functions.cli \
@@ -135,6 +152,7 @@ dist_network_SCRIPTS = \
        src/functions/functions.interrupts \
        src/functions/functions.ip \
        src/functions/functions.ipsec \
+       src/functions/functions.ipsec-pool \
        src/functions/functions.iptables \
        src/functions/functions.ip-tunnel \
        src/functions/functions.ipv4 \
@@ -164,6 +182,8 @@ dist_network_SCRIPTS = \
        src/functions/functions.vpn \
        src/functions/functions.vpn-security-policies \
        src/functions/functions.wireless \
+       src/functions/functions.wireless-mesh \
+       src/functions/functions.wireless-networks \
        src/functions/functions.wpa_supplicant \
        src/functions/functions.zone \
        src/network-radvd-config \
@@ -175,14 +195,12 @@ dist_network_SCRIPTS = \
        src/ppp/pppoe-server
 
 dist_helpers_SCRIPTS = \
-       src/helpers/bridge-stp \
        src/helpers/dhcpd-config-helper \
        src/helpers/firewall-kernel-init \
        src/helpers/hostapd-config-helper \
        src/helpers/ipsec-updown \
        src/helpers/pppd-angel \
-       src/helpers/wpa_supplicant \
-       src/helpers/wpa_supplicant-config-helper
+       src/helpers/wpa_supplicant
 
 bin_PROGRAMS = \
        src/inetcalc
@@ -190,30 +208,22 @@ bin_PROGRAMS = \
 src_inetcalc_SOURCES = \
        src/inetcalc.c
 
-bridge-stp-install-hook: bridge-stp-uninstall-hook
-       ln -svf --relative $(DESTDIR)$(helpersdir)/bridge-stp $(DESTDIR)$(sbindir)/
-
-bridge-stp-uninstall-hook:
-       rm -f $(DESTDIR)$(sbindir)/bridge-stp
-
-INSTALL_EXEC_HOOKS += bridge-stp-install-hook
-UNINSTALL_EXEC_HOOKS += bridge-stp-uninstall-hook
+src_inetcalc_LDADD = \
+       src/libnetwork.la
 
 dist_hooks_configs_SCRIPTS = \
        src/hooks/configs/dhcp \
-       src/hooks/configs/ipv4-static \
        src/hooks/configs/ipv6-auto \
-       src/hooks/configs/ipv6-static \
-       src/hooks/configs/pppoe-server
+       src/hooks/configs/pppoe-server \
+       src/hooks/configs/static
 
 dist_hooks_ports_SCRIPTS = \
-       src/hooks/ports/batman-adv \
        src/hooks/ports/bonding \
        src/hooks/ports/dummy \
        src/hooks/ports/ethernet \
        src/hooks/ports/vlan \
-       src/hooks/ports/wireless-adhoc \
-       src/hooks/ports/wireless-ap
+       src/hooks/ports/wireless-ap \
+       src/hooks/ports/wireless-mesh
 
 dist_hooks_zones_SCRIPTS = \
        src/hooks/zones/6to4-tunnel \
@@ -222,6 +232,72 @@ dist_hooks_zones_SCRIPTS = \
        src/hooks/zones/pppoe \
        src/hooks/zones/wireless
 
+INSTALL_DIRS += \
+       $(configdir) \
+       $(configdir)/ports \
+       $(configdir)/vpn \
+       $(configdir)/vpn/ipsec/connections \
+       $(configdir)/vpn/security-policies \
+       $(configdir)/wireless \
+       $(configdir)/wireless/networks \
+       $(configdir)/zones
+
+# ------------------------------------------------------------------------------
+
+LIBNETWORK_CURRENT=0
+LIBNETWORK_REVISION=0
+LIBNETWORK_AGE=0
+
+pkginclude_HEADERS = \
+       src/libnetwork/network/interface.h \
+       src/libnetwork/network/libnetwork.h \
+       src/libnetwork/network/logging.h \
+       src/libnetwork/network/phy.h
+
+lib_LTLIBRARIES = \
+       src/libnetwork.la
+
+src_libnetwork_la_SOURCES = \
+       src/libnetwork/interface.c \
+       src/libnetwork/libnetwork-private.h \
+       src/libnetwork/libnetwork.c \
+       src/libnetwork/phy.c
+
+src_libnetwork_la_LIBADD = \
+       $(LIBNL_LIBS)
+
+src_libnetwork_la_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       $(LIBNL_CPPFLAGS) \
+       -D_GNU_SOURCE \
+       -DNETWORK_PRIVATE
+
+src_libnetwork_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(LIBNL_CFLAGS)
+
+src_libnetwork_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
+       -version-info $(LIBNETWORK_CURRENT):$(LIBNETWORK_REVISION):$(LIBNETWORK_AGE) \
+       -Wl,--version-script=$(top_srcdir)/src/libnetwork/libnetwork.sym
+
+src_libnetwork_la_DEPENDENCIES = \
+       src/libnetwork/libnetwork.sym
+
+EXTRA_DIST += \
+       src/libnetwork/libnetwork.sym
+
+# ------------------------------------------------------------------------------
+
+util_PROGRAMS = \
+       src/utils/network-phy-list-ht-caps
+
+src_utils_network_phy_list_ht_caps_SOURCES = \
+       src/utils/network-phy-list-ht-caps.c
+
+src_utils_network_phy_list_ht_caps_LDADD = \
+       src/libnetwork.la
+
 # ------------------------------------------------------------------------------
 
 ppp_SCRIPTS = \
@@ -319,11 +395,11 @@ endif
 
 # ------------------------------------------------------------------------------
 
-pkgconfigdata_DATA = \
+pkgconfig_DATA = \
        src/network.pc
 
 CLEANFILES += \
-       $(pkgconfigdata_DATA)
+       $(pkgconfig_DATA)
 
 EXTRA_DIST += \
        src/network.pc.in
@@ -353,12 +429,12 @@ MANPAGES = \
        man/network-dns-server.8 \
        man/network-performance-tuning.8 \
        man/network-port.8 \
-       man/network-port-batman-adv.8 \
-       man/network-port-batman-adv-port.8 \
        man/network-quick-start.8 \
        man/network-route.8 \
        man/network-route-static.8 \
        man/network-settings.8 \
+       man/network-vpn.8 \
+       man/network-vpn-security-policies.8 \
        man/network-zone.8 \
        man/network-zone-6to4-tunnel.8 \
        man/network-zone-bridge.8 \
@@ -418,23 +494,15 @@ substitutions = \
        '|exec_prefix=$(exec_prefix)|' \
        '|sbindir=$(sbindir)|' \
        '|networkdir=$(networkdir)|' \
-       '|helpersdir=$(helpersdir)|'
+       '|helpersdir=$(helpersdir)|' \
+       '|utildir=$(utildir)|'
 
 SED_PROCESS = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(SED) $(subst '|,-e 's|@,$(subst =,\@|,$(subst |',|g',$(substitutions)))) \
                < $< > $@
 
-src/functions/functions: src/functions/functions.in Makefile
-       $(SED_PROCESS)
-
-src/ppp/ip-updown: src/ppp/ip-updown.in Makefile
-       $(SED_PROCESS)
-
-src/systemd/%: src/systemd/%.in Makefile
-       $(SED_PROCESS)
-
-src/%.pc: src/%.pc.in Makefile
+%: %.in Makefile
        $(SED_PROCESS)
 
 INSTALL_DIRS += \
@@ -447,6 +515,7 @@ uninstall-hook: $(UNINSTALL_EXEC_HOOKS)
 # - testsuite ------------------------------------------------------------------
 
 TESTS_ENVIRONMENT = \
+       LD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(LD_LIBRARY_PATH) \
        PATH=$(top_builddir)/src:$(PATH) \
        functions=$(abs_builddir)/src/functions/functions \
        networkdir=$(abs_srcdir)/src/functions \
@@ -469,3 +538,21 @@ TESTS = \
        test/functions/ip/ip_prefix_is_valid \
        test/functions/ip/ip_protocol_is_supported \
        test/functions/ip/ip_split_prefix
+
+# - NITSI tests ----------------------------------------------------------------
+
+NITSI_TESTS = \
+       test/nitsi/test/hello-world
+
+EXTRA_DIST += \
+       test/nitsi/test/hello-world/recipe \
+       test/nitsi/test/hello-world/settings
+
+NITSI_ENVIRONMENT =
+
+.PHONY: $(NITSI_TESTS)
+$(NITSI_TESTS): dist
+       $(AM_V_NITSI) $(NITSI_ENVIRONMENT) $(NITSI) --log-level error -d $@
+
+.PHONY: nitsi
+nitsi: $(NITSI_TESTS)