Merge pull request #2760 from ronnychevalier/rc/core_no_new_privileges_seccompv3

[thirdparty/systemd.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5f47a817626b60b92dcca16dd5ab4a597f09ee8c..c2a82a5a35e7a14f02951c35e2e0c8f23b41366b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -744,6 +744,7 @@ noinst_LTLIBRARIES += \
 
 libbasic_la_SOURCES = \
        src/basic/missing.h \
+       src/basic/missing_syscall.h \
        src/basic/capability-util.c \
        src/basic/capability-util.h \
        src/basic/c-rbtree.c \
@@ -1432,6 +1433,18 @@ tests += \
        test-utf8 \
        test-ellipsize \
        test-util \
+       test-cpu-set-util \
+       test-hexdecoct \
+       test-escape \
+       test-alloc-util \
+       test-proc-cmdline \
+       test-io-util \
+       test-glob-util \
+       test-xattr-util \
+       test-fs-util \
+       test-web-util \
+       test-stat-util \
+       test-fd-util \
        test-string-util \
        test-extract-word \
        test-parse-util \
@@ -1550,6 +1563,7 @@ EXTRA_DIST += \
        test/test-execute/exec-passenvironment-repeated.service \
        test/test-execute/exec-passenvironment.service \
        test/test-execute/exec-group.service \
+       test/test-execute/exec-group-nfsnobody.service \
        test/test-execute/exec-ignoresigpipe-no.service \
        test/test-execute/exec-ignoresigpipe-yes.service \
        test/test-execute/exec-personality-x86-64.service \
@@ -1565,7 +1579,10 @@ EXTRA_DIST += \
        test/test-execute/exec-systemcallfilter-failing.service \
        test/test-execute/exec-systemcallfilter-not-failing2.service \
        test/test-execute/exec-systemcallfilter-not-failing.service \
+       test/test-execute/exec-systemcallfilter-system-user.service \
+       test/test-execute/exec-systemcallfilter-system-user-nfsnobody.service \
        test/test-execute/exec-user.service \
+       test/test-execute/exec-user-nfsnobody.service \
        test/test-execute/exec-workingdirectory.service \
        test/test-execute/exec-umask-0177.service \
        test/test-execute/exec-umask-default.service \
@@ -1582,10 +1599,13 @@ EXTRA_DIST += \
        test/test-execute/exec-capabilityboundingset-reset.service \
        test/test-execute/exec-capabilityboundingset-simple.service \
        test/test-execute/exec-capabilityambientset.service \
+       test/test-execute/exec-capabilityambientset-nfsnobody.service \
        test/test-execute/exec-capabilityambientset-merge.service \
+       test/test-execute/exec-capabilityambientset-merge-nfsnobody.service \
        test/test-execute/exec-runtimedirectory.service \
        test/test-execute/exec-runtimedirectory-mode.service \
        test/test-execute/exec-runtimedirectory-owner.service \
+       test/test-execute/exec-runtimedirectory-owner-nfsnobody.service \
        test/bus-policy/hello.conf \
        test/bus-policy/methods.conf \
        test/bus-policy/ownerships.conf \
@@ -1761,6 +1781,78 @@ test_util_SOURCES = \
 test_util_LDADD = \
        libshared.la
 
+test_hexdecoct_SOURCES = \
+       src/test/test-hexdecoct.c
+
+test_hexdecoct_LDADD = \
+       libbasic.la
+
+test_alloc_util_SOURCES = \
+       src/test/test-alloc-util.c
+
+test_alloc_util_LDADD = \
+       libbasic.la
+
+test_xattr_util_SOURCES = \
+       src/test/test-xattr-util.c
+
+test_xattr_util_LDADD = \
+       libbasic.la
+
+test_io_util_SOURCES = \
+       src/test/test-io-util.c
+
+test_io_util_LDADD = \
+       libbasic.la
+
+test_glob_util_SOURCES = \
+       src/test/test-glob-util.c
+
+test_glob_util_LDADD = \
+       libbasic.la
+
+test_fs_util_SOURCES = \
+       src/test/test-fs-util.c
+
+test_fs_util_LDADD = \
+       libbasic.la
+
+test_proc_cmdline_SOURCES = \
+       src/test/test-proc-cmdline.c
+
+test_proc_cmdline_LDADD = \
+       libbasic.la
+
+test_fd_util_SOURCES = \
+       src/test/test-fd-util.c
+
+test_fd_util_LDADD = \
+       libbasic.la
+
+test_web_util_SOURCES = \
+       src/test/test-web-util.c
+
+test_web_util_LDADD = \
+       libbasic.la
+
+test_cpu_set_util_SOURCES = \
+       src/test/test-cpu-set-util.c
+
+test_cpu_set_util_LDADD = \
+       libbasic.la
+
+test_stat_util_SOURCES = \
+       src/test/test-stat-util.c
+
+test_stat_util_LDADD = \
+       libbasic.la
+
+test_escape_SOURCES = \
+       src/test/test-escape.c
+
+test_escape_LDADD = \
+       libbasic.la
+
 test_string_util_SOURCES = \
        src/test/test-string-util.c
 
@@ -3860,6 +3952,34 @@ systemd_cat_SOURCES = \
 systemd_cat_LDADD = \
        libjournal-core.la
 
+if HAVE_LIBCURL
+rootlibexec_PROGRAMS += \
+        systemd-journal-upload
+
+systemd_journal_upload_SOURCES = \
+        src/journal-remote/journal-upload.h \
+        src/journal-remote/journal-upload.c \
+        src/journal-remote/journal-upload-journal.c
+
+systemd_journal_upload_CFLAGS = \
+        $(AM_CFLAGS) \
+        $(LIBCURL_CFLAGS)
+
+systemd_journal_upload_LDADD = \
+        libshared.la \
+        $(LIBCURL_LIBS)
+
+nodist_systemunit_DATA += \
+        units/systemd-journal-upload.service
+
+nodist_pkgsysconf_DATA += \
+        src/journal-remote/journal-upload.conf
+endif
+
+EXTRA_DIST += \
+        units/systemd-journal-upload.service.in \
+        src/journal-remote/journal-upload.conf.in
+
 if HAVE_MICROHTTPD
 rootlibexec_PROGRAMS += \
        systemd-journal-remote
@@ -3919,34 +4039,6 @@ EXTRA_DIST += \
        src/journal-remote/log-generator.py
 endif
 
-if HAVE_LIBCURL
-rootlibexec_PROGRAMS += \
-       systemd-journal-upload
-
-systemd_journal_upload_SOURCES = \
-       src/journal-remote/journal-upload.h \
-       src/journal-remote/journal-upload.c \
-       src/journal-remote/journal-upload-journal.c
-
-systemd_journal_upload_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(LIBCURL_CFLAGS)
-
-systemd_journal_upload_LDADD = \
-       libshared.la \
-       $(LIBCURL_LIBS)
-
-nodist_systemunit_DATA += \
-       units/systemd-journal-upload.service
-
-nodist_pkgsysconf_DATA += \
-       src/journal-remote/journal-upload.conf
-endif
-
-EXTRA_DIST += \
-       units/systemd-journal-upload.service.in \
-       src/journal-remote/journal-upload.conf.in
-
 # using _CFLAGS = in the conditional below would suppress AM_CFLAGS
 journalctl_CFLAGS = \
        $(AM_CFLAGS)
@@ -6077,7 +6169,6 @@ DISTCHECK_CONFIGURE_FLAGS += \
 endif
 
 .PHONY: dist-check-help
-
 dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS)
        for i in $(abspath $^); do                                             \
             if $$i  --help | grep -v 'default:' | grep -E -q '.{80}.' ; then   \
@@ -6086,6 +6177,18 @@ dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS)
                exit 1;                                                        \
             fi; done
 
+include_compilers = "$(CC)" "$(CC) -ansi" "$(CC) -std=iso9899:1990"
+public_headers = $(filter-out src/systemd/_sd-common.h, $(pkginclude_HEADERS) $(include_HEADERS))
+.PHONY: dist-check-includes
+dist-check-includes: $(public_headers)
+       @res=0;                                                                 \
+       for i in $(abspath $^); do                                              \
+           for cc in $(include_compilers); do                                  \
+               echo "$$cc -o/dev/null -c -x c -include "$$i" - </dev/null";    \
+               $$cc -o/dev/null -c -x c -include "$$i" - </dev/null || res=1;  \
+           done;                                                               \
+       done; exit $$res
+
 .PHONY: hwdb-update
 hwdb-update:
        ( cd $(top_srcdir)/hwdb && \