prep: Initialize PC speaker

[qemu.git] / Makefile.user

diff --git a/Makefile.user b/Makefile.user
index c6ac50940a9db41162ce9e9c66163b28d4d2d159..b71782040789ede74bf9bf5fb12cf95c7a3f0d1c 100644 (file)
--- a/Makefile.user
+++ b/Makefile.user
@@ -6,13 +6,10 @@ 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
 
 include $(SRC_PATH)/Makefile.objs
 
@@ -21,7 +18,9 @@ all: $(user-obj-y)
        @true
 
 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)