From nobody Mon Feb 9 20:12:36 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597401105; cv=none; d=zohomail.com; s=zohoarc; b=UzFFBU6BcUbvrGQKTfxaaeczLWknBRBbY2N1TLIEn/nbUM9Ww7moHvwYgWRndhsitrBDntmaUSiMjyugwWXyfkMYIBc+RFv16Ra2sWEsepvd3aMqQ+38kmCUjfCq2nYQyEJDmVsKTkIrKXnI9eHPU3FEjyrhLSBEh+Cg0lmZHU8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597401105; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=iEnLf32NFJ5LjjINTFQYj1fZyndUO08zmS1dGSaxZSE=; b=eQ4Z1E05qpdtDNRDy0GsKhFdPWHBOjqlo4PkoOPdcqFOmSsynWAvA8Aad2jVgux5W7W6nkruVPVqHqYYzC6kyrd49kcbgofVnkbyHGfL39/s9dgiyUtjEuPG5JR3TIiq3sI9tj5YdojNRevFjjwhLOucWbhRIBs7WD11SOaAaDA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597401105407222.97893480985238; Fri, 14 Aug 2020 03:31:45 -0700 (PDT) Received: from localhost ([::1]:47924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6Wzw-0000Kh-3T for importer@patchew.org; Fri, 14 Aug 2020 06:31:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44326) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k6Vnv-0008Ir-8c for qemu-devel@nongnu.org; Fri, 14 Aug 2020 05:15:15 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:27384 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k6Vnq-0003D1-8a for qemu-devel@nongnu.org; Fri, 14 Aug 2020 05:15:14 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-40-IWjT1Q9pOqOE6PD0l3aRCg-1; Fri, 14 Aug 2020 05:15:07 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CC886801AC2 for ; Fri, 14 Aug 2020 09:15:06 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7BF8A1972B; Fri, 14 Aug 2020 09:15:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597396509; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iEnLf32NFJ5LjjINTFQYj1fZyndUO08zmS1dGSaxZSE=; b=fF30h7FZMvpxoS5kka7pvRtlWwWh9g0oItdokPIe3cE6Gelm/2Qpt3AZunCO8s0l4R6Zn1 rxhmOXqyVz0RcN4ZIlswx3e7LCv1V0nM+Ob4oWvLxfTigjkPdZ1QLRR8lcgylTfvslDdaC W5uK7PCX/2sXK2NkvuMr1vGUhZwd7qs= X-MC-Unique: IWjT1Q9pOqOE6PD0l3aRCg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 136/150] rules.mak: remove version.o Date: Fri, 14 Aug 2020 05:13:12 -0400 Message-Id: <20200814091326.16173-137-pbonzini@redhat.com> In-Reply-To: <20200814091326.16173-1-pbonzini@redhat.com> References: <20200814091326.16173-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.61; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/14 01:57:54 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- Makefile | 5 ----- Makefile.objs | 4 ---- rules.mak | 4 +--- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 8331c0fd39..d91352d8ef 100644 --- a/Makefile +++ b/Makefile @@ -232,11 +232,6 @@ recurse-clean: $(addsuffix /clean, $(TARGET_DIRS) $(RO= M_DIRS)) recurse-install: $(addsuffix /install, $(TARGET_DIRS)) $(addsuffix /install, $(TARGET_DIRS)): all =20 -$(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc config-host.h - $(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@ $<,"RC","version.o") - -Makefile: $(version-obj-y) - ###################################################################### =20 clean: recurse-clean ninja-clean clean-ctlist diff --git a/Makefile.objs b/Makefile.objs index 5295c3a623..c351b59641 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -32,7 +32,3 @@ crypto-obj-y =3D crypto/libcrypto.fa io-obj-y =3D io/libio.fa =20 endif # CONFIG_SOFTMMU or CONFIG_TOOLS - -###################################################################### -# Resource file for Windows executables -version-obj-$(CONFIG_WIN32) +=3D $(BUILD_DIR)/version.o diff --git a/rules.mak b/rules.mak index b983c7f83f..6d89001f0a 100644 --- a/rules.mak +++ b/rules.mak @@ -77,8 +77,6 @@ expand-objs =3D $(strip $(sort $(filter %.o,$1)) \ $(call quiet-command,$(CC) $(QEMU_LOCAL_INCLUDES) $(QEMU_INCLUDES) \ $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) $($@-cflags) \ -c -o $@ $<,"CC","$(TARGET_DIR)$@") -%.o: %.rc - $(call quiet-command,$(WINDRES) -I. -o $@ $<,"RC","$(TARGET_DIR)$@") =20 # If we have a CXX we might have some C++ objects, in which case we # must link with the C++ compiler, not the plain C compiler. @@ -86,7 +84,7 @@ LINKPROG =3D $(or $(CXX),$(CC)) =20 LINK =3D $(call quiet-command, $(LINKPROG) $(CFLAGS) $(QEMU_LDFLAGS) -o $@= \ $(call process-archive-undefs, $1) \ - $(version-obj-y) $(call extract-libs,$1) $(LIBS),"LINK","$(TARGET_D= IR)$@") + $(call extract-libs,$1) $(LIBS),"LINK","$(TARGET_DIR)$@") =20 %.o: %.S $(call quiet-command,$(CCAS) $(QEMU_LOCAL_INCLUDES) $(QEMU_INCLUDES) \ --=20 2.26.2