Revision 76cad711 Makefile

b/Makefile
99 99
	rm -f config-all-devices.mak $(SUBDIR_DEVICES_MAK)
100 100

  
101 101
-include config-all-devices.mak
102
-include config-all-disas.mak
102 103

  
103 104
all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all
104 105

  
......
129 130

  
130 131
$(SUBDIR_RULES): libqemustub.a
131 132

  
132
$(filter %-softmmu,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) $(common-obj-y) $(extra-obj-y) subdir-libdis
133
$(filter %-softmmu,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) $(common-obj-y) $(extra-obj-y)
133 134

  
134
$(filter %-user,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) subdir-libdis-user subdir-libuser
135
$(filter %-user,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) subdir-libuser
135 136

  
136 137
ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))
137 138
romsubdir-%:
......
223 224

  
224 225
qemu-ga$(EXESUF): qemu-ga.o $(qga-obj-y) $(oslib-obj-y) $(trace-obj-y) $(qapi-obj-y) $(qobject-obj-y) $(version-obj-y) libqemustub.a
225 226

  
226
QEMULIBS=libuser libdis libdis-user
227
QEMULIBS=libuser
227 228

  
228 229
clean:
229 230
# avoid old build problems by removing potentially incorrect old files
......
255 256

  
256 257
distclean: clean
257 258
	rm -f config-host.mak config-host.h* config-host.ld $(DOCS) qemu-options.texi qemu-img-cmds.texi qemu-monitor.texi
258
	rm -f config-all-devices.mak
259
	rm -f config-all-devices.mak config-all-disas.mak
259 260
	rm -f roms/seabios/config.mak roms/vgabios/config.mak
260 261
	rm -f qemu-doc.info qemu-doc.aux qemu-doc.cp qemu-doc.cps qemu-doc.dvi
261 262
	rm -f qemu-doc.fn qemu-doc.fns qemu-doc.info qemu-doc.ky qemu-doc.kys

Also available in: Unified diff