X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=ac650044ba2e2f15dbb411e7667201e3be6188ce;hp=f2a3bbd024fdff477e493d4bc5e5d93cff870ac9;hb=5590bbe52985f9f01dbafa740df9c74f2ea95ffa;hpb=091a364c802e34a58f3260c9cb5db9b75c62215c

diff --git a/Makefile.am b/Makefile.am
index f2a3bbd02..ac650044b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1689,8 +1689,8 @@ endif
 endif
 
 EXTRA_DIST += \
-        units/systemd-modules-load.service.in \
-        units/kmod-static-nodes.service.in
+	units/systemd-modules-load.service.in \
+	units/kmod-static-nodes.service.in
 
 # ------------------------------------------------------------------------------
 if ENABLE_TMPFILES
@@ -2536,15 +2536,15 @@ test_dhcp_client_LDADD = \
 	libsystemd-shared.la
 
 test_ipv4ll_SOURCES = \
-        src/systemd/sd-ipv4ll.h \
-        src/libsystemd-network/ipv4ll-internal.h \
-        src/libsystemd-network/test-ipv4ll.c
+	src/systemd/sd-ipv4ll.h \
+	src/libsystemd-network/ipv4ll-internal.h \
+	src/libsystemd-network/test-ipv4ll.c
 
 test_ipv4ll_LDADD = \
-        libsystemd-network.la \
-        libsystemd-label.la \
-        libsystemd-internal.la \
-        libsystemd-shared.la
+	libsystemd-network.la \
+	libsystemd-label.la \
+	libsystemd-internal.la \
+	libsystemd-shared.la
 
 tests += \
 	test-dhcp-option \
@@ -4200,6 +4200,10 @@ systemd_resolved_SOURCES = \
 	src/resolve/resolved.c \
 	src/resolve/resolved-manager.c
 
+systemd_resolved_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(KMOD_CFLAGS)
+
 nodist_systemd_resolved_SOURCES = \
 	src/resolve/resolved-gperf.c
 
@@ -4301,6 +4305,10 @@ systemd_networkd_wait_online_LDADD = \
 test_network_SOURCES = \
 	src/network/test-network.c
 
+test_network_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(KMOD_CFLAGS)
+
 test_network_LDADD = \
 	libsystemd-networkd-core.la
 	$(KMOD_LIBS)
@@ -4879,7 +4887,9 @@ substitutions = \
        '|PYTHON=$(PYTHON)|' \
        '|PYTHON_BINARY=$(PYTHON_BINARY)|' \
        '|NTP_SERVERS=$(NTP_SERVERS)|' \
-       '|DNS_SERVERS=$(DNS_SERVERS)|'
+       '|DNS_SERVERS=$(DNS_SERVERS)|' \
+       '|systemuidmax=$(SYSTEM_UID_MAX)|' \
+       '|systemgidmax=$(SYSTEM_GID_MAX)|'
 
 SED_PROCESS = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
@@ -5172,9 +5182,9 @@ linkcheck:
 hwdb-update:
 	( cd $(top_srcdir)/hwdb && \
 	wget -N http://www.linux-usb.org/usb.ids \
-	        http://pci-ids.ucw.cz/v2.2/pci.ids \
-	        http://standards.ieee.org/develop/regauth/oui/oui.txt \
-	        http://standards.ieee.org/develop/regauth/iab/iab.txt && \
+		http://pci-ids.ucw.cz/v2.2/pci.ids \
+		http://standards.ieee.org/develop/regauth/oui/oui.txt \
+		http://standards.ieee.org/develop/regauth/iab/iab.txt && \
 	./ids-update.pl )
 
 .PHONY: kdbus-update
@@ -5219,7 +5229,7 @@ valgrind-tests: $(TESTS)
 		if file $$f | grep -q shell; then \
 		echo -e "$${x}Skipping non-binary $$f"; else \
 		echo -e "$${x}Running $$f"; \
-	        libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=5242880 --error-exitcode=55 $(builddir)/$$f ; fi; \
+		libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=5242880 --error-exitcode=55 $(builddir)/$$f ; fi; \
 		x="\n\n"; \
 	done