Rename formats-util.h to format-util.h

[thirdparty/systemd.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f7ae9ff7aa8d7e2919d14dc83e9b3484844852ea..37efdd86256b1d059988ca25fbf72b94d6a15346 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,9 +42,9 @@ LIBUDEV_CURRENT=7
 LIBUDEV_REVISION=5
 LIBUDEV_AGE=6
 
-LIBSYSTEMD_CURRENT=16
+LIBSYSTEMD_CURRENT=17
 LIBSYSTEMD_REVISION=0
-LIBSYSTEMD_AGE=16
+LIBSYSTEMD_AGE=17
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -493,7 +493,6 @@ dist_systemunit_DATA = \
        units/swap.target \
        units/slices.target \
        units/system.slice \
-       units/x-.slice \
        units/systemd-initctl.socket \
        units/syslog.socket \
        units/dev-hugepages.mount \
@@ -524,7 +523,6 @@ dist_systemunit_DATA_busnames += \
 nodist_systemunit_DATA = \
        units/getty@.service \
        units/serial-getty@.service \
-       units/console-shell.service \
        units/console-getty.service \
        units/container-getty@.service \
        units/systemd-initctl.service \
@@ -587,7 +585,6 @@ dist_systempreset_DATA = \
 EXTRA_DIST += \
        units/getty@.service.m4 \
        units/serial-getty@.service.m4 \
-       units/console-shell.service.m4.in \
        units/console-getty.service.m4.in \
        units/container-getty@.service.m4.in \
        units/rescue.service.in \
@@ -639,17 +636,6 @@ GENERAL_ALIASES += \
        $(systemunitdir)/reboot.target $(pkgsysconfdir)/system/ctrl-alt-del.target \
        $(systemunitdir)/machines.target $(pkgsysconfdir)/system/multi-user.target.wants/machines.target
 
-# automake is broken and can't handle files with a dash in front
-# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14728#8
-units-install-hook:
-       mv $(DESTDIR)$(systemunitdir)/x-.slice $(DESTDIR)/$(systemunitdir)/-.slice
-
-units-uninstall-hook:
-       rm -f $(DESTDIR)/$(systemunitdir)/-.slice
-
-INSTALL_DATA_HOOKS += units-install-hook
-UNINSTALL_DATA_HOOKS += units-uninstall-hook
-
 dist_doc_DATA = \
        README \
        NEWS \
@@ -946,7 +932,7 @@ libbasic_la_SOURCES = \
        src/basic/copy.h \
        src/basic/alloc-util.h \
        src/basic/alloc-util.c \
-       src/basic/formats-util.h \
+       src/basic/format-util.h \
        src/basic/nss-util.h
 
 nodist_libbasic_la_SOURCES = \
@@ -1277,8 +1263,8 @@ libcore_la_SOURCES = \
        src/core/audit-fd.h \
        src/core/show-status.c \
        src/core/show-status.h \
-       src/core/failure-action.c \
-       src/core/failure-action.h
+       src/core/emergency-action.c \
+       src/core/emergency-action.h
 
 nodist_libcore_la_SOURCES = \
        src/core/load-fragment-gperf.c \
@@ -1572,6 +1558,11 @@ tests += \
        test-acl-util
 endif
 
+if HAVE_SECCOMP
+tests += \
+       test-seccomp
+endif
+
 EXTRA_DIST += \
        test/a.service \
        test/basic.target \
@@ -1629,6 +1620,15 @@ EXTRA_DIST += \
        test/test-execute/exec-passenvironment.service \
        test/test-execute/exec-group.service \
        test/test-execute/exec-group-nfsnobody.service \
+       test/test-execute/exec-supplementarygroups.service \
+       test/test-execute/exec-supplementarygroups-single-group.service \
+       test/test-execute/exec-supplementarygroups-single-group-user.service \
+       test/test-execute/exec-supplementarygroups-multiple-groups-default-group-user.service \
+       test/test-execute/exec-supplementarygroups-multiple-groups-withgid.service \
+       test/test-execute/exec-supplementarygroups-multiple-groups-withuid.service \
+       test/test-execute/exec-dynamicuser-fixeduser.service \
+       test/test-execute/exec-dynamicuser-fixeduser-one-supplementarygroup.service \
+       test/test-execute/exec-dynamicuser-supplementarygroups.service \
        test/test-execute/exec-ignoresigpipe-no.service \
        test/test-execute/exec-ignoresigpipe-yes.service \
        test/test-execute/exec-personality-x86-64.service \
@@ -1641,6 +1641,9 @@ EXTRA_DIST += \
        test/test-execute/exec-privatedevices-yes.service \
        test/test-execute/exec-privatedevices-no-capability-mknod.service \
        test/test-execute/exec-privatedevices-yes-capability-mknod.service \
+       test/test-execute/exec-protectkernelmodules-no-capabilities.service \
+       test/test-execute/exec-protectkernelmodules-yes-capabilities.service \
+       test/test-execute/exec-protectkernelmodules-yes-mount-propagation.service \
        test/test-execute/exec-privatetmp-no.service \
        test/test-execute/exec-privatetmp-yes.service \
        test/test-execute/exec-readonlypaths.service \
@@ -2031,6 +2034,13 @@ test_acl_util_SOURCES = \
 test_acl_util_LDADD = \
        libsystemd-shared.la
 
+test_seccomp_SOURCES = \
+       src/test/test-seccomp.c
+
+test_seccomp_LDADD = \
+       libsystemd-shared.la \
+       $(SECCOMP_LIBS)
+
 test_namespace_LDADD = \
        libcore.la
 
@@ -5904,8 +5914,10 @@ pam_systemd_la_LIBADD = \
 pamlib_LTLIBRARIES = \
        pam_systemd.la
 
+if ENABLE_PAM_CONFIG
 dist_pamconf_DATA = \
        src/login/systemd-user
+endif
 
 EXTRA_DIST += \
        src/login/systemd-user.m4
@@ -6027,6 +6039,9 @@ EXTRA_DIST += \
        test/TEST-11-ISSUE-3166/test.sh \
        test/TEST-12-ISSUE-3171/Makefile \
        test/TEST-12-ISSUE-3171/test.sh \
+       test/TEST-13-NSPAWN-SMOKE/Makefile \
+       test/TEST-13-NSPAWN-SMOKE/create-busybox-container \
+       test/TEST-13-NSPAWN-SMOKE/test.sh \
        test/test-functions
 
 EXTRA_DIST += \