X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile.user;h=9302d33245a495bdb70e1d20da598d7803923d42;hb=1241ed94c331ddd8fc8297b02b4508ead59467de;hp=7daedeff6d89dc033caf491b3db47e03410838d2;hpb=58faa1a6dbce2be38ab1107c2dc4335ac8df8a63;p=mirror_qemu.git

diff --git a/Makefile.user b/Makefile.user
index 7daedeff6d..9302d33245 100644
--- a/Makefile.user
+++ b/Makefile.user
@@ -6,27 +6,19 @@ include $(SRC_PATH)/rules.mak
 
 .PHONY: all
 
-# Do not take %.o from $(SRC_PATH), only %.c and %.h
-# All %.o for user targets should be built with -fpie, when
-# configured with --enable-user-pie, so we don't want to
-# take %.o from $(SRC_PATH), since they built without -fpie
-vpath %.c %.h $(SRC_PATH)
+$(call set-vpath, $(SRC_PATH))
 
 QEMU_CFLAGS+=-I..
+QEMU_CFLAGS += -I$(SRC_PATH)/include
+QEMU_CFLAGS += -DCONFIG_USER_ONLY
 
-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 *~
-
-# Include automatically generated dependency files
--include $(wildcard *.d */*.d)
+	for d in . trace; do \
+	rm -f $$d/*.o $$d/*.d $$d/*.a $$d/*~; \
+	done