Revision 8e98e2e8
| b/Makefile | ||
|---|---|---|
| 132 | 132 |
|
| 133 | 133 |
$(filter %-softmmu,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) $(common-obj-y) $(extra-obj-y) |
| 134 | 134 |
|
| 135 |
$(filter %-user,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) subdir-libuser
|
|
| 135 |
$(filter %-user,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) $(user-obj-y)
|
|
| 136 | 136 |
|
| 137 | 137 |
ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS)) |
| 138 | 138 |
romsubdir-%: |
| ... | ... | |
| 224 | 224 |
|
| 225 | 225 |
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 |
| 226 | 226 |
|
| 227 |
QEMULIBS=libuser |
|
| 228 |
|
|
| 229 | 227 |
clean: |
| 230 | 228 |
# avoid old build problems by removing potentially incorrect old files |
| 231 | 229 |
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 | 240 |
rm -rf qapi-generated |
| 243 | 241 |
rm -rf qga/qapi-generated |
| 244 | 242 |
$(MAKE) -C tests/tcg clean |
| 245 |
for d in $(ALL_SUBDIRS) $(QEMULIBS) libcacard; do \
|
|
| 243 |
for d in $(ALL_SUBDIRS) libcacard; do \ |
|
| 246 | 244 |
if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \ |
| 247 | 245 |
rm -f $$d/qemu-options.def; \ |
| 248 | 246 |
done |
| ... | ... | |
| 265 | 263 |
rm -f config.log |
| 266 | 264 |
rm -f linux-headers/asm |
| 267 | 265 |
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 |
| 268 |
for d in $(TARGET_DIRS) $(QEMULIBS); do \
|
|
| 266 |
for d in $(TARGET_DIRS); do \ |
|
| 269 | 267 |
rm -rf $$d || exit 1 ; \ |
| 270 | 268 |
done |
| 271 | 269 |
if test -f pixman/config.log; then make -C pixman distclean; fi |
| b/Makefile.objs | ||
|---|---|---|
| 123 | 123 |
user-obj-y += cache-utils.o |
| 124 | 124 |
user-obj-y += module.o |
| 125 | 125 |
user-obj-y += qemu-user.o |
| 126 |
user-obj-y += $(trace-obj-y) |
|
| 127 | 126 |
user-obj-y += qom/ |
| 128 | 127 |
|
| 129 | 128 |
###################################################################### |
| ... | ... | |
| 196 | 195 |
|
| 197 | 196 |
$(trace-obj-y): $(GENERATED_HEADERS) |
| 198 | 197 |
|
| 198 |
universal-obj-y += $(trace-obj-y) |
|
| 199 |
|
|
| 199 | 200 |
###################################################################### |
| 200 | 201 |
# smartcard |
| 201 | 202 |
|
| b/Makefile.target | ||
|---|---|---|
| 155 | 155 |
|
| 156 | 156 |
ifdef CONFIG_SOFTMMU |
| 157 | 157 |
all-obj-y += $(addprefix ../, $(common-obj-y)) |
| 158 |
all-obj-y += $(addprefix ../, $(trace-obj-y)) |
|
| 159 | 158 |
else |
| 160 |
all-obj-y += $(addprefix ../libuser/, $(user-obj-y))
|
|
| 159 |
all-obj-y += $(addprefix ../, $(user-obj-y)) |
|
| 161 | 160 |
endif #CONFIG_LINUX_USER |
| 162 | 161 |
|
| 163 | 162 |
ifdef QEMU_PROGW |
| /dev/null | ||
|---|---|---|
| 1 |
# Makefile for qemu target independent user files. |
|
| 2 |
|
|
| 3 |
include ../config-host.mak |
|
| 4 |
include $(SRC_PATH)/rules.mak |
|
| 5 |
-include config.mak |
|
| 6 |
|
|
| 7 |
.PHONY: all |
|
| 8 |
|
|
| 9 |
$(call set-vpath, $(SRC_PATH)) |
|
| 10 |
|
|
| 11 |
QEMU_CFLAGS+=-I.. |
|
| 12 |
QEMU_CFLAGS += -I$(SRC_PATH)/include |
|
| 13 |
QEMU_CFLAGS += -DCONFIG_USER_ONLY |
|
| 14 |
|
|
| 15 |
include $(SRC_PATH)/Makefile.objs |
|
| 16 |
|
|
| 17 |
all: $(user-obj-y) |
|
| 18 |
# Dummy command so that make thinks it has done something |
|
| 19 |
@true |
|
| 20 |
|
|
| 21 |
clean: |
|
| 22 |
for d in . trace; do \ |
|
| 23 |
rm -f $$d/*.o $$d/*.d $$d/*.a $$d/*~; \ |
|
| 24 |
done |
|
| b/configure | ||
|---|---|---|
| 4212 | 4212 |
echo "LD=$ld" >> $config_mak |
| 4213 | 4213 |
done |
| 4214 | 4214 |
|
| 4215 |
d=libuser |
|
| 4216 |
symlink "$source_path/Makefile.user" "$d/Makefile" |
|
| 4217 |
|
|
| 4218 | 4215 |
if test "$docs" = "yes" ; then |
| 4219 | 4216 |
mkdir -p QMP |
| 4220 | 4217 |
fi |
Also available in: Unified diff