Merge systemd-verify with systemd-analyze

This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2014-07-21 21:42:28 -04:00
parent 1a40a3393e
commit 1d3bc0177a
7 changed files with 121 additions and 164 deletions
+11 -17
View File
@@ -350,8 +350,7 @@ bin_PROGRAMS = \
systemd-delta \
systemd-analyze \
systemd-run \
systemd-path \
systemd-verify
systemd-path
dist_bin_SCRIPTS = \
src/kernel-install/kernel-install
@@ -1226,19 +1225,6 @@ CLEANFILES += \
# ------------------------------------------------------------------------------
systemd_verify_SOURCES = \
src/verify/verify.c
systemd_verify_CFLAGS = \
$(AM_CFLAGS) \
$(SECCOMP_CFLAGS)
systemd_verify_LDADD = \
libsystemd-core.la \
$(RT_LIBS)
# ------------------------------------------------------------------------------
manual_tests += \
test-ns \
test-loopback \
@@ -1738,11 +1724,19 @@ endif
# ------------------------------------------------------------------------------
systemd_analyze_SOURCES = \
src/analyze/analyze.c
src/analyze/analyze.c \
src/analyze/analyze-verify.c \
src/analyze/analyze-verify.h
systemd_verify_CFLAGS = \
$(AM_CFLAGS) \
$(SECCOMP_CFLAGS)
systemd_analyze_LDADD = \
libsystemd-core.la \
libsystemd-internal.la \
libsystemd-shared.la
libsystemd-shared.la \
$(RT_LIBS)
# ------------------------------------------------------------------------------
systemd_initctl_SOURCES = \