Revision 4d904533 Makefile

b/Makefile
80 80
endif
81 81

  
82 82
$(common-obj-y): $(GENERATED_HEADERS)
83
$(filter %-softmmu,$(SUBDIR_RULES)): $(common-obj-y)
83
$(filter %-softmmu,$(SUBDIR_RULES)): $(common-obj-y) subdir-libdis
84 84

  
85
$(filter %-user,$(SUBDIR_RULES)): $(GENERATED_HEADERS) subdir-libuser
85
$(filter %-user,$(SUBDIR_RULES)): $(GENERATED_HEADERS) subdir-libdis-user subdir-libuser
86 86

  
87 87
ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))
88 88
romsubdir-%:
......
152 152
	rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d net/*.o net/*.d
153 153
	rm -f qemu-img-cmds.h
154 154
	$(MAKE) -C tests clean
155
	for d in $(ALL_SUBDIRS) libhw32 libhw64 libuser; do \
155
	for d in $(ALL_SUBDIRS) libhw32 libhw64 libuser libdis libdis-user; do \
156 156
	if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \
157 157
        done
158 158

  
......
161 161
	rm -f config-all-devices.mak
162 162
	rm -f roms/seabios/config.mak roms/vgabios/config.mak
163 163
	rm -f qemu-{doc,tech}.{info,aux,cp,dvi,fn,info,ky,log,pdf,pg,toc,tp,vr}
164
	for d in $(TARGET_DIRS) libhw32 libhw64 libuser; do \
164
	for d in $(TARGET_DIRS) libhw32 libhw64 libuser libdis libdis-user; do \
165 165
	rm -rf $$d || exit 1 ; \
166 166
        done
167 167

  

Also available in: Unified diff