chiark / gitweb /
build-sys: fix distcheck
[elogind.git] / Makefile.am
index c70409c..84b587d 100644 (file)
@@ -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 += \
@@ -1249,7 +1252,7 @@ src/shared/cap-list.txt:
        $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/capability.h -include missing.h - </dev/null | $(AWK) '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $$2; }' | grep -v CAP_LAST_CAP >$@
 
 src/shared/cap-to-name.h: src/shared/cap-list.txt
-       $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const capability_names[] = { "} { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
+       $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const capability_names[] = { "} { printf "[%s] = \"%s\",\n", $$1, tolower($$1) } END{print "};"}' <$< >$@
 
 src/shared/cap-from-name.gperf: src/shared/cap-list.txt
        $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct capability_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' <$< >$@
@@ -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
 
@@ -2610,6 +2622,9 @@ EXTRA_DIST += \
        units/systemd-bus-proxyd@.service.m4.in \
        units/user/systemd-bus-proxyd@.service.in
 
+CLEANFILES += \
+       units/systemd-bus-proxyd@.service.m4
+
 if HAVE_SMACK
 bus-proxyd-set-cap-hook:
        -$(SETCAP) cap_mac_admin+ei $(DESTDIR)$(rootlibexecdir)/systemd-bus-proxyd
@@ -2639,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 \
@@ -2699,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-internal.h
 
 nodist_libsystemd_internal_la_SOURCES = \
        src/libsystemd/libsystemd.sym
@@ -3160,15 +3179,15 @@ nodist_userunit_DATA += \
 USER_DEFAULT_TARGET_WANTS += \
        systemd-consoled.service
 
-EXTRA_DIST += \
-       units/user/systemd-consoled.service.in
-
 tests += \
        test-term-page \
        test-term-parser \
        test-unifont
 endif
 
+EXTRA_DIST += \
+       units/user/systemd-consoled.service.in
+
 libsystemd_terminal_la_CFLAGS = \
        $(AM_CFLAGS) \
        $(TERMINAL_CFLAGS)
@@ -3313,7 +3332,6 @@ libudev_la_SOURCES =\
        src/libudev/libudev-enumerate.c \
        src/libudev/libudev-monitor.c \
        src/libudev/libudev-queue.c \
-       src/libudev/libudev-hwdb-def.h \
        src/libudev/libudev-hwdb.c
 
 libudev_la_CFLAGS = \
@@ -3597,7 +3615,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
@@ -5946,7 +5965,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 < $< > $@
 
@@ -6256,10 +6275,13 @@ doc-sync: all destdir-sphinx
        rsync -rlv --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/
        rsync -rlv --delete --omit-dir-times docs/html/python-systemd/ $(www_target)/python-systemd/
 
-.PHONY: tango
-tango: upload
+.PHONY: gardel
+gardel: upload
+       scp man/*.html gardel:public/systemd-man/
+
+.PHONY: lennart-fedora
+lennart-fedora:
        cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
-       scp man/*.html tango:public/systemd-man/
 
 .PHONY: install-tree
 install-tree: all