From patchwork Tue Jul 1 11:18:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Dovgalyuk X-Patchwork-Id: 366044 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7E4B11400AF for ; Tue, 1 Jul 2014 21:18:54 +1000 (EST) Received: from localhost ([::1]:46174 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1w5M-0002fq-EZ for incoming@patchwork.ozlabs.org; Tue, 01 Jul 2014 07:18:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56309) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1w4m-000244-4C for qemu-devel@nongnu.org; Tue, 01 Jul 2014 07:18:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X1w4e-0007cB-C9 for qemu-devel@nongnu.org; Tue, 01 Jul 2014 07:18:16 -0400 Received: from mail.ispras.ru ([83.149.199.45]:33067) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1w4d-0007bz-Qo for qemu-devel@nongnu.org; Tue, 01 Jul 2014 07:18:08 -0400 Received: from PASHAISP (unknown [80.250.189.177]) by mail.ispras.ru (Postfix) with ESMTPSA id 32B24540151 for ; Tue, 1 Jul 2014 15:18:07 +0400 (MSK) From: "Pavel Dovgaluk" To: "'QEMU Developers'" Date: Tue, 1 Jul 2014 15:18:08 +0400 Message-ID: <007501cf951e$233977c0$69ac6740$@Dovgaluk@ispras.ru> MIME-Version: 1.0 X-Mailer: Microsoft Office Outlook 12.0 Thread-Index: Ac+VHiL2bJFJP00DQbygaSDhDEymEg== Content-Language: ru X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 83.149.199.45 Subject: [Qemu-devel] [RFC PATCH 01/22] Makefiles X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Changes in main makefiles. Signed-off-by: Pavel Dovgalyuk diff --git a/Makefile.target b/Makefile.target index 6089d29..357ab4d --- a/Makefile.target +++ b/Makefile.target @@ -76,6 +76,7 @@ all: $(PROGS) stap ######################################################### # cpu emulator library obj-y = exec.o translate-all.o cpu-exec.o +obj-y += replay/ obj-y += tcg/tcg.o tcg/optimize.o obj-$(CONFIG_TCG_INTERPRETER) += tci.o obj-$(CONFIG_TCG_INTERPRETER) += disas/tci.o @@ -85,6 +86,8 @@ obj-y += disas.o obj-$(call notempty,$(TARGET_XML_FILES)) += gdbstub-xml.o obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o +replay/replay.o replay/replay-events.o replay/replay-internal.o: CFLAGS+= -Wno-unused-result + obj-$(CONFIG_LIBDECNUMBER) += libdecnumber/decContext.o obj-$(CONFIG_LIBDECNUMBER) += libdecnumber/decNumber.o obj-$(CONFIG_LIBDECNUMBER) += libdecnumber/dpd/decimal32.o diff --git a/net/Makefile.objs b/net/Makefile.objs index a06ba59..cc6f32b --- a/net/Makefile.objs +++ b/net/Makefile.objs @@ -1,6 +1,6 @@ common-obj-y = net.o queue.o checksum.o util.o hub.o common-obj-y += socket.o -common-obj-y += dump.o +common-obj-y += dump.o net-replay.o common-obj-y += eth.o common-obj-$(CONFIG_LINUX) += l2tpv3.o common-obj-$(CONFIG_POSIX) += tap.o vhost-user.o