shared: add new btrfs-util.[ch] helpers for doing common btrfs operation

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ac7924ed8524b314633def6d1d6e0f5a54846560..417074945ff862b35c3bce63144fa47f2c0f25c6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -217,6 +217,7 @@ AM_CPPFLAGS = \
        -I $(top_srcdir)/src/libsystemd/sd-event \
        -I $(top_srcdir)/src/libsystemd/sd-rtnl \
        -I $(top_srcdir)/src/libsystemd/sd-network \
+       -I $(top_srcdir)/src/libsystemd/sd-hwdb \
        -I $(top_srcdir)/src/libsystemd-network \
        -I $(top_srcdir)/src/libsystemd-terminal \
        $(OUR_CPPFLAGS)
@@ -890,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 += \
@@ -1318,7 +1321,8 @@ manual_tests += \
        test-install \
        test-watchdog \
        test-log \
-       test-ipcrm
+       test-ipcrm \
+       test-btrfs
 
 if HAVE_KMOD
 manual_tests += \
@@ -1442,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 \
@@ -1753,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
 
@@ -2642,6 +2654,7 @@ libsystemd_internal_la_SOURCES = \
        src/systemd/sd-daemon.h \
        src/systemd/sd-path.h \
        src/systemd/sd-network.h \
+       src/systemd/sd-hwdb.h \
        src/libsystemd/sd-bus/sd-bus.c \
        src/libsystemd/sd-bus/bus-control.c \
        src/libsystemd/sd-bus/bus-control.h \
@@ -2702,7 +2715,10 @@ libsystemd_internal_la_SOURCES = \
        src/libsystemd/sd-path/sd-path.c \
        src/libsystemd/sd-network/sd-network.c \
        src/libsystemd/sd-network/network-util.h \
-       src/libsystemd/sd-network/network-util.c
+       src/libsystemd/sd-network/network-util.c \
+       src/libsystemd/sd-hwdb/sd-hwdb.c \
+       src/libsystemd/sd-hwdb/hwdb-util.h \
+       src/libsystemd/sd-hwdb/hwdb-intenal.h
 
 nodist_libsystemd_internal_la_SOURCES = \
        src/libsystemd/libsystemd.sym
@@ -3600,7 +3616,8 @@ test_libudev_SOURCES = \
 test_libudev_LDADD = \
        libsystemd-label.la \
        libudev-internal.la \
-       libsystemd-shared.la
+       libsystemd-shared.la \
+       libsystemd-internal.la
 
 test_udev_SOURCES = \
        src/test/test-udev.c
@@ -5949,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 < $< > $@