Merge remote-tracking branch 'kraxel/usb.21' into staging

[qemu.git] / Makefile.user

diff --git a/Makefile.user b/Makefile.user
index 907e74bd9eec7d7f395e0a67055e792c90988293..024b7736b936b9a790716a2ebfeb26ac5cd8f554 100644 (file)
--- a/Makefile.user
+++ b/Makefile.user
@@ -2,24 +2,20 @@
 
 include ../config-host.mak
 include $(SRC_PATH)/rules.mak
+-include config.mak
 
 .PHONY: all
 
-VPATH=$(SRC_PATH)
+$(call set-vpath, $(SRC_PATH))
 
 QEMU_CFLAGS+=-I..
 
-obj-y =
-obj-y += envlist.o path.o
-obj-y += tcg-runtime.o host-utils.o
-obj-y += cutils.o cache-utils.o
+include $(SRC_PATH)/Makefile.objs
 
-all: libuser.a
+all: $(user-obj-y)
 # Dummy command so that make thinks it has done something
        @true
 
-libuser.a: $(obj-y)
-
 clean:
        rm -f *.o *.d *.a *~