From patchwork Mon Dec 17 18:17:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 206974 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C32542C007A for ; Tue, 18 Dec 2012 06:19:30 +1100 (EST) Received: from localhost ([::1]:55936 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkfHV-00060J-M6 for incoming@patchwork.ozlabs.org; Mon, 17 Dec 2012 13:19:13 -0500 Received: from eggs.gnu.org ([208.118.235.92]:51830) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkfGQ-0003sZ-4a for qemu-devel@nongnu.org; Mon, 17 Dec 2012 13:18:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TkfGO-0004qE-Pi for qemu-devel@nongnu.org; Mon, 17 Dec 2012 13:18:05 -0500 Received: from mail-wg0-f43.google.com ([74.125.82.43]:46408) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkfGO-0004q7-Jc for qemu-devel@nongnu.org; Mon, 17 Dec 2012 13:18:04 -0500 Received: by mail-wg0-f43.google.com with SMTP id e12so2757884wge.10 for ; Mon, 17 Dec 2012 10:18:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=g/LerEKA2eILnnvgtNB7TOmNRD5H0KeNo4SwbIUbzss=; b=wom812KGQ5Ha8v3r33l8r8rv6L2feVPNcwWu698pM544FlZn9NaDpmKYqO+/54ErRF 1EutnHVKWD2fTlY90bJAemmAHRpapXwIWm93w8zspJpTskH2NHWv4dMXMYRz8qUY15Ho JNeXvYToS8OqNVrBjyJ0GFws+G42Gc4VM3+1O8cgshQ5YbbxT9JzKmlCp7Oc+YmNQks1 XHJaAGm7xqQ4rHSbPNAQfQAE+6lnW9NxmkSnl08FGVP/3s/GqlJev+zML720uwYcXAOd OR+4X7rpTGDaPePK4o/UqHCNcpCHZiwkY7wYmIDaiQifArT5flPtfUgCyBadzZaIZNCN yeBg== Received: by 10.194.9.162 with SMTP id a2mr18738302wjb.33.1355768283695; Mon, 17 Dec 2012 10:18:03 -0800 (PST) Received: from yakj.lan (93-34-219-150.ip51.fastwebnet.it. [93.34.219.150]) by mx.google.com with ESMTPS id bz12sm13692375wib.5.2012.12.17.10.18.02 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 17 Dec 2012 10:18:02 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 17 Dec 2012 19:17:10 +0100 Message-Id: <1355768254-12933-9-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.0.2 In-Reply-To: <1355768254-12933-1-git-send-email-pbonzini@redhat.com> References: <1355768254-12933-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 74.125.82.43 Subject: [Qemu-devel] [PATCH 08/32] build: kill libuser 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 Signed-off-by: Paolo Bonzini --- Makefile | 8 +++----- Makefile.objs | 3 ++- Makefile.target | 3 +-- Makefile.user | 24 ------------------------ configure | 3 --- 5 files changed, 6 insertions(+), 35 deletions(-) delete mode 100644 Makefile.user diff --git a/Makefile b/Makefile index da47cb8..0c6ad1e 100644 --- a/Makefile +++ b/Makefile @@ -132,7 +132,7 @@ $(SUBDIR_RULES): libqemustub.a $(filter %-softmmu,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) $(common-obj-y) $(extra-obj-y) -$(filter %-user,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) subdir-libuser +$(filter %-user,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) $(user-obj-y) ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS)) romsubdir-%: @@ -224,8 +224,6 @@ $(qga-obj-y) qemu-ga.o: $(QGALIB_GEN) qemu-ga$(EXESUF): qemu-ga.o $(qga-obj-y) $(oslib-obj-y) $(trace-obj-y) $(qapi-obj-y) $(qobject-obj-y) $(version-obj-y) libqemustub.a -QEMULIBS=libuser - clean: # avoid old build problems by removing potentially incorrect old files rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h @@ -242,7 +240,7 @@ clean: rm -rf qapi-generated rm -rf qga/qapi-generated $(MAKE) -C tests/tcg clean - for d in $(ALL_SUBDIRS) $(QEMULIBS) libcacard; do \ + for d in $(ALL_SUBDIRS) libcacard; do \ if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \ rm -f $$d/qemu-options.def; \ done @@ -265,7 +263,7 @@ distclean: clean rm -f config.log rm -f linux-headers/asm rm -f qemu-tech.info qemu-tech.aux qemu-tech.cp qemu-tech.dvi qemu-tech.fn qemu-tech.info qemu-tech.ky qemu-tech.log qemu-tech.pdf qemu-tech.pg qemu-tech.toc qemu-tech.tp qemu-tech.vr - for d in $(TARGET_DIRS) $(QEMULIBS); do \ + for d in $(TARGET_DIRS); do \ rm -rf $$d || exit 1 ; \ done if test -f pixman/config.log; then make -C pixman distclean; fi diff --git a/Makefile.objs b/Makefile.objs index 3248eaf..986f085 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -123,7 +123,6 @@ user-obj-y += tcg-runtime.o host-utils.o user-obj-y += cache-utils.o user-obj-y += module.o user-obj-y += qemu-user.o -user-obj-y += $(trace-obj-y) user-obj-y += qom/ ###################################################################### @@ -196,6 +195,8 @@ trace-obj-y += trace/control.o $(trace-obj-y): $(GENERATED_HEADERS) +universal-obj-y += $(trace-obj-y) + ###################################################################### # smartcard diff --git a/Makefile.target b/Makefile.target index f353651..8bbad38 100644 --- a/Makefile.target +++ b/Makefile.target @@ -155,9 +155,8 @@ all-obj-y += $(addprefix ../, $(universal-obj-y)) ifdef CONFIG_SOFTMMU all-obj-y += $(addprefix ../, $(common-obj-y)) -all-obj-y += $(addprefix ../, $(trace-obj-y)) else -all-obj-y += $(addprefix ../libuser/, $(user-obj-y)) +all-obj-y += $(addprefix ../, $(user-obj-y)) endif #CONFIG_LINUX_USER ifdef QEMU_PROGW diff --git a/Makefile.user b/Makefile.user deleted file mode 100644 index 9302d33..0000000 --- a/Makefile.user +++ /dev/null @@ -1,24 +0,0 @@ -# Makefile for qemu target independent user files. - -include ../config-host.mak -include $(SRC_PATH)/rules.mak --include config.mak - -.PHONY: all - -$(call set-vpath, $(SRC_PATH)) - -QEMU_CFLAGS+=-I.. -QEMU_CFLAGS += -I$(SRC_PATH)/include -QEMU_CFLAGS += -DCONFIG_USER_ONLY - -include $(SRC_PATH)/Makefile.objs - -all: $(user-obj-y) -# Dummy command so that make thinks it has done something - @true - -clean: - for d in . trace; do \ - rm -f $$d/*.o $$d/*.d $$d/*.a $$d/*~; \ - done diff --git a/configure b/configure index f180e17..4d0e116 100755 --- a/configure +++ b/configure @@ -4212,9 +4212,6 @@ for rom in seabios vgabios ; do echo "LD=$ld" >> $config_mak done -d=libuser -symlink "$source_path/Makefile.user" "$d/Makefile" - if test "$docs" = "yes" ; then mkdir -p QMP fi