[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: |
Wed, 24 Oct 2012 14:58:38 +0200 |
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 5691e9e..07b7049 100644
--- a/Makefile
+++ b/Makefile
@@ -110,7 +110,7 @@ subdir-libcacard: $(oslib-obj-y) $(trace-obj-y)
qemu-timer-common.o
$(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-%:
@@ -197,8 +197,6 @@ $(qga-obj-y) qemu-ga.o: $(QGALIB_GEN)
qemu-ga$(EXESUF): qemu-ga.o $(qga-obj-y) $(tools-obj-y) $(qapi-obj-y)
$(qobject-obj-y) $(version-obj-y)
-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
@@ -215,7 +213,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
@@ -238,7 +236,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
diff --git a/Makefile.objs b/Makefile.objs
index ea4171d..0b89b8a 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -116,7 +116,6 @@ user-obj-y += tcg-runtime.o host-utils.o
user-obj-y += cutils.o iov.o cache-utils.o
user-obj-y += module.o
user-obj-y += qemu-user.o
-user-obj-y += $(trace-obj-y)
user-obj-y += qom/
######################################################################
@@ -189,6 +188,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 29ff39a..0ab8556 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -152,9 +152,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 9776cda..9329b97 100755
--- a/configure
+++ b/configure
@@ -4108,9 +4108,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.7.1
- [Qemu-devel] [PATCH 28/32] softmmu: move include files to include/sysemu/, (continued)
- [Qemu-devel] [PATCH 28/32] softmmu: move include files to include/sysemu/, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 10/32] janitor: do not rely on indirect inclusions from qemu-char.h, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 14/32] net: move net.c to net/, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 18/32] audio: move public header file to include/audio/, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 31/32] hw: move executable format header files to hw/, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 30/32] fpu: move public header file to include/fpu, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 09/32] janitor: move iovector functions out of cutils.c, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 19/32] slirp: move public header file to include/slirp/, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 32/32] janitor: move remaining public headers to include/, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 26/32] qom: move include files to include/qom/, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 08/32] build: kill libuser,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 25/32] migration: move include files to include/migration/, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 16/32] qemu-ga: move qemu-ga files to qga/, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 17/32] ui: move files to ui/ and include/ui/, Paolo Bonzini, 2012/10/24
- Re: [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup, Andreas Färber, 2012/10/24
- Re: [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup, Stefan Hajnoczi, 2012/10/25
- Re: [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup, Zhi Yong Wu, 2012/10/25