[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/32] build: kill libuser
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 08/32] build: kill libuser |
Date: |
Mon, 17 Dec 2012 19:17:10 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
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
--
1.8.0.2
- [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 01/32] libcacard: simplify rules for recursive build, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 03/32] build: adjust setting of QEMU_INCLUDES, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 02/32] vscclient: use per-target variables, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 04/32] build: add $(TARGET_DIR) to "GEN config-target.h" lines, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 05/32] build: move rules from Makefile to */Makefile.objs, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 06/32] build: create ldscripts/, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 08/32] build: kill libuser,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 07/32] build: kill libdis, move disassemblers to disas/, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 09/32] janitor: do not rely on indirect inclusions of or from qemu-char.h, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 12/32] net: do not include net.h everywhere, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 13/32] net: move net.c to net/, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 10/32] janitor: do not include qemu-char everywhere, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 11/32] net: move Bluetooth stuff out of net.h, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 17/32] qapi: move inclusions of qemu-common.h from headers to .c files, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 16/32] ui: move files to ui/ and include/ui/, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 18/32] qapi: remove qapi/qapi-types-core.h, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 15/32] qemu-ga: move qemu-ga files to qga/, Paolo Bonzini, 2012/12/17