summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2014-02-22 18:47:28 +0100
committerKay Sievers <kay@vrfy.org>2014-02-22 18:48:01 +0100
commit41fd4c4c15e74a39cecfa5f1764e039c8d88617b (patch)
treeaeea4e198f34ddc97aea8df3d5ce19e9fd426567
parentfcc70b92f44788e89252011a4c87151961fd8999 (diff)
build-sys: add seccomp includes where needed
-rw-r--r--Makefile.am46
1 files changed, 44 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 647e993a5f..dd9ba96d93 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -775,6 +775,10 @@ nodist_libsystemd_shared_la_SOURCES = \
src/shared/errno-from-name.h \
src/shared/errno-to-name.h
+libsystemd_shared_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(SECCOMP_CFLAGS)
+
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
libsystemd-units.la
@@ -817,7 +821,6 @@ libsystemd_label_la_LIBADD = \
# ------------------------------------------------------------------------------
if HAVE_SECCOMP
-
noinst_LTLIBRARIES += \
libsystemd-seccomp.la
@@ -831,7 +834,6 @@ libsystemd_seccomp_la_CFLAGS = \
libsystemd_seccomp_la_LIBADD = \
$(SECCOMP_LIBS)
-
endif
# ------------------------------------------------------------------------------
@@ -1081,6 +1083,10 @@ src/shared/errno-to-name.h: src/shared/errno-list.txt
systemd_SOURCES = \
src/core/main.c
+systemd_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(SECCOMP_CFLAGS)
+
systemd_LDADD = \
libsystemd-core.la \
$(RT_LIBS)
@@ -1178,6 +1184,10 @@ test_device_nodes_LDADD = \
test_engine_SOURCES = \
src/test/test-engine.c
+test_engine_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(SECCOMP_CFLAGS)
+
test_engine_LDADD = \
libsystemd-core.la \
$(RT_LIBS)
@@ -1185,6 +1195,10 @@ test_engine_LDADD = \
test_job_type_SOURCES = \
src/test/test-job-type.c
+test_job_type_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(SECCOMP_CFLAGS)
+
test_job_type_LDADD = \
libsystemd-core.la \
$(RT_LIBS)
@@ -1192,6 +1206,10 @@ test_job_type_LDADD = \
test_ns_SOURCES = \
src/test/test-ns.c
+test_ns_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(SECCOMP_CFLAGS)
+
test_ns_LDADD = \
libsystemd-core.la
@@ -1221,6 +1239,10 @@ endif
test_unit_name_SOURCES = \
src/test/test-unit-name.c
+test_unit_name_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(SECCOMP_CFLAGS)
+
test_unit_name_LDADD = \
libsystemd-core.la \
$(RT_LIBS)
@@ -1228,6 +1250,10 @@ test_unit_name_LDADD = \
test_unit_file_SOURCES = \
src/test/test-unit-file.c
+test_unit_file_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(SECCOMP_CFLAGS)
+
test_unit_file_LDADD = \
libsystemd-core.la \
$(RT_LIBS)
@@ -1278,6 +1304,10 @@ test_tables_SOURCES = \
src/test/test-tables.c \
src/shared/test-tables.h
+test_tables_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(SECCOMP_CFLAGS)
+
test_tables_LDADD = \
libsystemd-logs.la \
libsystemd-journal-internal.la \
@@ -1371,6 +1401,10 @@ test_cgroup_mask_CPPFLAGS = \
$(AM_CPPFLAGS) \
-DTEST_DIR=\"$(abs_top_srcdir)/test\"
+test_cgroup_mask_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(SECCOMP_CFLAGS)
+
test_cgroup_mask_LDADD = \
libsystemd-core.la \
$(RT_LIBS)
@@ -1437,6 +1471,10 @@ test_sched_prio_CPPFLAGS = \
$(AM_CPPFLAGS) \
-DTEST_DIR=\"$(abs_top_srcdir)/test\"
+test_sched_prio_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(SECCOMP_CFLAGS)
+
test_sched_prio_LDADD = \
libsystemd-core.la \
$(RT_LIBS)
@@ -2164,6 +2202,10 @@ test_bus_chat_LDADD = \
test_bus_cleanup_SOURCES = \
src/libsystemd/sd-bus/test-bus-cleanup.c
+test_bus_cleanup_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(SECCOMP_CFLAGS)
+
test_bus_cleanup_LDADD = \
libsystemd-internal.la \
libsystemd-shared.la