Makefile: Remove any excess substitution rules

[people/ms/network.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e59995cf91cff3f8bec23bae2414bb7f5dba7f91..73c79f501f99b63234ef2c5aa8788adbd8c10d3d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,6 +51,7 @@ hooks_zonesdir   = $(hooksdir)/zones
 triggersdir      = $(networkdir)/triggers
 
 logdir           = $(localestatedir)/log/network
+utildir          = $(networkdir)
 
 CLEANFILES =
 DISTCLEANFILES =
@@ -88,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    " $@;
@@ -106,7 +111,7 @@ dist_sbin_SCRIPTS = \
        src/firewall6 \
        src/network
 
-network_SCRIPTS = \
+network_DATA = \
        src/functions/functions
 
 CLEANFILES += \
@@ -115,7 +120,7 @@ CLEANFILES += \
 EXTRA_DIST += \
        src/functions/functions.in
 
-dist_network_SCRIPTS = \
+dist_network_DATA = \
        src/functions/functions.at \
        src/functions/functions.auth \
        src/functions/functions.bonding \
@@ -208,10 +213,9 @@ src_inetcalc_LDADD = \
 
 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/bonding \
@@ -245,14 +249,32 @@ LIBNETWORK_REVISION=0
 LIBNETWORK_AGE=0
 
 pkginclude_HEADERS = \
-       src/libnetwork/network/libnetwork.h
+       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/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) \
@@ -267,6 +289,17 @@ EXTRA_DIST += \
 
 # ------------------------------------------------------------------------------
 
+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 = \
        src/ppp/ip-updown
 
@@ -461,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 += \
@@ -513,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)