qapi: QMP input visitor, handle floats parsed as ints

[mirror_qemu.git] / Makefile.user

diff --git a/Makefile.user b/Makefile.user
index 9e4f040e7cbc3eb5db7d128b5ccea2deeac2260a..b71782040789ede74bf9bf5fb12cf95c7a3f0d1c 100644 (file)
--- a/Makefile.user
+++ b/Makefile.user
@@ -2,31 +2,25 @@
 
 include ../config-host.mak
 include $(SRC_PATH)/rules.mak
-include config.mak
+-include config.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
 
-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 *~
+       for d in . trace; do \
+       rm -f $$d/*.o $$d/*.d $$d/*.a $$d/*~; \
+       done
 
 # Include automatically generated dependency files
 -include $(wildcard *.d */*.d)