X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=417074945ff862b35c3bce63144fa47f2c0f25c6;hb=7430ec6ac08f2c0416d9f806964c46b30f3862b2;hp=5c8f6a6b56f1f1faaa9046f5dbbc983c0cc85c19;hpb=8b516fdea74127327b0945bb50690bd70c6b6692;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 5c8f6a6b5..417074945 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -891,7 +891,9 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/memfd-util.h \
 	src/shared/uid-range.c \
 	src/shared/uid-range.h \
-	src/shared/nss-util.h
+	src/shared/nss-util.h \
+	src/shared/btrfs-util.c \
+	src/shared/btrfs-util.h
 
 if HAVE_UTMP
 libsystemd_shared_la_SOURCES += \
@@ -1319,7 +1321,8 @@ manual_tests += \
 	test-install \
 	test-watchdog \
 	test-log \
-	test-ipcrm
+	test-ipcrm \
+	test-btrfs
 
 if HAVE_KMOD
 manual_tests += \
@@ -1443,6 +1446,8 @@ EXTRA_DIST += \
 	test/exec-systemcallfilter-not-failing.service \
 	test/exec-user.service \
 	test/exec-workingdirectory.service \
+	test/exec-umask-0177.service \
+	test/exec-umask-default.service \
 	test/bus-policy/hello.conf \
 	test/bus-policy/methods.conf \
 	test/bus-policy/ownerships.conf \
@@ -1754,6 +1759,12 @@ test_ipcrm_LDADD = \
 	libsystemd-shared.la \
 	-lrt
 
+test_btrfs_SOURCES = \
+	src/test/test-btrfs.c
+
+test_btrfs_LDADD = \
+	libsystemd-shared.la
+
 test_rtnl_manual_SOURCES = \
 	src/test/test-rtnl-manual.c
 
@@ -5955,7 +5966,7 @@ units/%: units/%.m4
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@
 
-units/user/%: units/%.m4
+units/user/%: units/user/%.m4
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@