From nobody Mon Feb 9 08:57:24 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=1596744922; cv=none; d=zohomail.com; s=zohoarc; b=mSIZE5FtwbxKo9mL9CShVFq6CFJ+zfY8gBtkI4vt3mjKFCZbp0d+1whhLFt7/maQcuJg5NTB6gIQUyTb+/8Rlyi4aWaVUzh74Q5fLWo4zVIaEuyFcnWMsEzujGv2OOA7xUe6xgD8Wt+4VD2CD1/MXAal3SxKSuFFmSIfwU7ZAA8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596744922; 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=tVqEBGyTZEFVoFVARraAcVNp2rF2NWt+IZYng3zX3l8=; b=NkEObSLfO8FmnFal0sLprEgT/B5oIwPHxqTZpAmQWgkINRHjT39tfKo6/a8urGBC3Q+ukhpT1j+v5kImPtdFS+uS5LGuGQnYd2rR0ailHo4S2iVXzK5MfhX/+to8nDSHRjFps5JwTtRfW+OpKADIi79B3h8R9f8XeJWeHVbi68A= 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 1596744922825488.77604488894644; Thu, 6 Aug 2020 13:15:22 -0700 (PDT) Received: from localhost ([::1]:33284 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k3mIL-0004G8-EE for importer@patchew.org; Thu, 06 Aug 2020 16:15:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44592) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3lRG-00035O-Nr for qemu-devel@nongnu.org; Thu, 06 Aug 2020 15:20:30 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:31320 helo=us-smtp-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 1k3lRD-0006vL-3h for qemu-devel@nongnu.org; Thu, 06 Aug 2020 15:20:30 -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-209-yRmcMlogPgu7inbFPRYNFw-1; Thu, 06 Aug 2020 15:20:24 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C5D79107BEFA for ; Thu, 6 Aug 2020 19:20:23 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id D7EE81D3; Thu, 6 Aug 2020 19:20:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596741626; 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=tVqEBGyTZEFVoFVARraAcVNp2rF2NWt+IZYng3zX3l8=; b=JtwNon+l8jRBlkPMh5BJdH2X4wWF5eljebivD6Oqilw3Gz0ZOLScysj/RfMQeg8gIRNZit PHu2knWU2w4NWLRTprFYE+lO+lZ8jj0ZFsRAcT4hq4awTceisD4L+kXIiNEpZHtfJEqUBr FzkHJ6CQSa4etswDgmwHpNg2+l/JmOs= X-MC-Unique: yRmcMlogPgu7inbFPRYNFw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 132/143] rules.mak: remove version.o Date: Thu, 6 Aug 2020 21:16:08 +0200 Message-Id: <1596741379-12902-133-git-send-email-pbonzini@redhat.com> In-Reply-To: <1596741379-12902-1-git-send-email-pbonzini@redhat.com> References: <1596741379-12902-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 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=207.211.31.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/06 03:10:56 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.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_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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 1f89680..603869d 100644 --- a/Makefile +++ b/Makefile @@ -226,11 +226,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 diff --git a/Makefile.objs b/Makefile.objs index 9f73e86..306d81d 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -31,7 +31,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 b983c7f..6d89001 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 1.8.3.1