summaryrefslogtreecommitdiffstats
path: root/Makefile.in
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2010-09-08 10:12:09 -0700
committerSimon Horman <horms@verge.net.au>2010-09-09 17:02:54 +0900
commit94311e029ddd339fa5cedd972505f38f5b072820 (patch)
tree5a98ba5dabbcdee68c72623a6991711427dd879b /Makefile.in
parent6eec65c4bc0779edaec91f25003f37cac3ef0ec3 (diff)
downloadkexec-tools-94311e029ddd339fa5cedd972505f38f5b072820.tar.gz
x86_64: Use the x86 crashdump
With proper biarch support in crashdump-x86, crashdump-x86_64 is now redudant and we can use crashdump-x86 everywhere. Using crashdump-x86 everywhere results in a little unnecessary i386 logic on x86_64 but is otherwise harmless. Removing the unnecessary duplication between i386 and x86_64 should make the code much easier to maintain going forward. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in8
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index 4d193b15..ba2e6384 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -158,6 +158,10 @@ include $(srcdir)/kexec/Makefile
#
include $(srcdir)/kdump/Makefile
+# vmcore-dmesg (read dmesg from a vmcore)
+#
+include $(srcdir)/vmcore-dmesg/Makefile
+
#
# kexec_test (test program)
#
@@ -171,10 +175,10 @@ SRCS:= $(dist)
PSRCS:=$(foreach s, $(SRCS), $(PACKAGE_NAME)-$(PACKAGE_VERSION)/$(s))
PGSRCS:=$(foreach s, $(GENERATED_SRCS), $(PACKAGE_NAME)-$(PACKAGE_VERSION)/$(s))
-MAN_PAGES:=$(KEXEC_MANPAGE) $(KDUMP_MANPAGE)
+MAN_PAGES:=$(KEXEC_MANPAGE) $(KDUMP_MANPAGE) $(VMCORE_DMESG_MANPAGE)
BINARIES_i386:=$(KEXEC_TEST) $(KEXEC_TEST)
BINARIES_x86_64:=$(KEXEC) $(KDUMP) $(BINARIES_$(ARCH))
-BINARIES:=$(KEXEC) $(KDUMP) $(BINARIES_$(ARCH))
+BINARIES:=$(KEXEC) $(KDUMP) $(VMCORE_DMESG) $(BINARIES_$(ARCH))
TARGETS:=$(BINARIES) $(MAN_PAGES)