From patchwork Fri Sep 18 11:41:12 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 48495 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8IBfpfC013794 for ; Fri, 18 Sep 2009 11:41:51 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756615AbZIRLlp (ORCPT ); Fri, 18 Sep 2009 07:41:45 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756592AbZIRLlo (ORCPT ); Fri, 18 Sep 2009 07:41:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29883 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756611AbZIRLln (ORCPT ); Fri, 18 Sep 2009 07:41:43 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8IBfkfe010664 for ; Fri, 18 Sep 2009 07:41:47 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8IBfa8k017440; Fri, 18 Sep 2009 07:41:41 -0400 From: Juan Quintela To: kvm@vger.kernel.org Subject: [PATCH 03/24] Remove merge artifacts Date: Fri, 18 Sep 2009 13:41:12 +0200 Message-Id: <7a065921ac07a105934c2741ec8a7e4cc65c9f6b.1253272938.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org CFLAGS and LDFLAGS are defined on config.mak LDFLAGS_BASE is not used anywhere DEPLIBS are not defined anywhere Signed-off-by: Juan Quintela --- Makefile.target | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/Makefile.target b/Makefile.target index a08e432..5fad812 100644 --- a/Makefile.target +++ b/Makefile.target @@ -1,13 +1,8 @@ # -*- Mode: makefile -*- -CFLAGS= -LDFLAGS= - include config.mak include $(SRC_PATH)/rules.mak -LDFLAGS_BASE:=$(LDFLAGS) - TARGET_PATH=$(SRC_PATH)/target-$(TARGET_BASE_ARCH) VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw QEMU_CFLAGS+= -I.. -I$(TARGET_PATH) -DNEED_CPU_H @@ -347,9 +342,6 @@ monitor.o: qemu-monitor.h ARLIBS=../libqemu_common.a libqemu.a $(HWLIB) -$(QEMU_PROG): ARLIBS += $(DEPLIBS) -$(QEMU_PROG): $(DEPLIBS) - endif # CONFIG_SOFTMMU $(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y) $(ARLIBS)