X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=420d514552da59751bdf971e149dafc7ee751733;hb=2023dc8a9a7d59eab16e020bbcd38b9e377ea452;hp=734e5c148ec43f0766969cd2b869b3895f1a7f47;hpb=2de30868edab5b099cb1e5413e47ed11ded4cc63;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 734e5c148..420d51455 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -412,7 +412,6 @@ dist_sysctl_DATA = \
 dist_systemunit_DATA = \
 	units/graphical.target \
 	units/multi-user.target \
-	units/emergency.service \
 	units/emergency.target \
 	units/sysinit.target \
 	units/basic.target \
@@ -3667,9 +3666,11 @@ tests += \
 	test-mmap-cache \
 	test-catalog
 
+if HAVE_COMPRESSION
 tests += \
 	test-compress \
 	test-compress-benchmark
+endif
 
 pkginclude_HEADERS += \
 	src/systemd/sd-journal.h \
@@ -4497,6 +4498,25 @@ BUSNAMES_TARGET_WANTS += \
 EXTRA_DIST += \
 	units/systemd-machined.service.in
 
+libnss_mymachines_la_SOURCES = \
+	src/nss-mymachines/nss-mymachines.sym \
+	src/nss-mymachines/nss-mymachines.c
+
+libnss_mymachines_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
+	-module \
+	-export-dynamic \
+	-avoid-version \
+	-shared \
+	-shrext .so.2 \
+	-Wl,--version-script=$(top_srcdir)/src/nss-mymachines/nss-mymachines.sym
+
+libnss_mymachines_la_LIBADD = \
+	libsystemd-shared.la \
+	libsystemd-internal.la
+
+lib_LTLIBRARIES += \
+	libnss_mymachines.la
 endif
 
 # ------------------------------------------------------------------------------
@@ -4580,6 +4600,7 @@ libsystemd_networkd_core_la_SOURCES = \
 	src/network/networkd-dummy.c \
 	src/network/networkd-tuntap.c \
 	src/network/networkd-bond.c \
+	src/network/networkd-bridge.c \
 	src/network/networkd-network.c \
 	src/network/networkd-address.c \
 	src/network/networkd-route.c \
@@ -5260,7 +5281,7 @@ units/user/%: units/%.m4
 	$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
 
 if ENABLE_POLKIT
-dist_polkitpolicy_DATA = \
+nodist_polkitpolicy_DATA = \
 	$(polkitpolicy_files) \
 	$(polkitpolicy_in_in_files:.policy.in.in=.policy)
 endif