From 1d3bc0177a1952473bbe45b5bbb4e4e4f69a84f4 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Mon, 21 Jul 2014 21:11:54 -0400 Subject: Merge systemd-verify with systemd-analyze --- Makefile.am | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 1cb7712386..1cb77b9fbf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 = \ -- cgit v1.2.3-54-g00ecf