Revision 4c3b5a48 Makefile

b/Makefile
47 47
-include $(SUBDIR_DEVICES_MAK_DEP)
48 48

  
49 49
%/config-devices.mak: default-configs/%.mak
50
	$(call quiet-command,$(SHELL) $(SRC_PATH)/make_device_config.sh $@ $<, "  GEN   $@")
50
	$(call quiet-command,$(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $@ $<, "  GEN   $@")
51 51
	@if test -f $@; then \
52 52
	  if cmp -s $@.old $@; then \
53 53
	    mv $@.tmp $@; \
......
76 76
config-host.h: config-host.h-timestamp
77 77
config-host.h-timestamp: config-host.mak
78 78
qemu-options.def: $(SRC_PATH)/qemu-options.hx
79
	$(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@,"  GEN   $@")
79
	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  GEN   $@")
80 80

  
81 81
SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))
82 82

  
......
118 118
trace.h: trace.h-timestamp
119 119
endif
120 120
trace.h-timestamp: $(SRC_PATH)/trace-events config-host.mak
121
	$(call quiet-command,sh $(SRC_PATH)/tracetool --$(TRACE_BACKEND) -h < $< > $@,"  GEN   trace.h")
121
	$(call quiet-command,sh $(SRC_PATH)/scripts/tracetool --$(TRACE_BACKEND) -h < $< > $@,"  GEN   trace.h")
122 122
	@cmp -s $@ trace.h || cp $@ trace.h
123 123

  
124 124
trace.c: trace.c-timestamp
125 125
trace.c-timestamp: $(SRC_PATH)/trace-events config-host.mak
126
	$(call quiet-command,sh $(SRC_PATH)/tracetool --$(TRACE_BACKEND) -c < $< > $@,"  GEN   trace.c")
126
	$(call quiet-command,sh $(SRC_PATH)/scripts/tracetool --$(TRACE_BACKEND) -c < $< > $@,"  GEN   trace.c")
127 127
	@cmp -s $@ trace.c || cp $@ trace.c
128 128

  
129 129
trace.o: trace.c $(GENERATED_HEADERS)
......
136 136
# rule file. So we use '.dtrace' instead
137 137
trace-dtrace.dtrace: trace-dtrace.dtrace-timestamp
138 138
trace-dtrace.dtrace-timestamp: $(SRC_PATH)/trace-events config-host.mak
139
	$(call quiet-command,sh $(SRC_PATH)/tracetool --$(TRACE_BACKEND) -d < $< > $@,"  GEN   trace-dtrace.dtrace")
139
	$(call quiet-command,sh $(SRC_PATH)/scripts/tracetool --$(TRACE_BACKEND) -d < $< > $@,"  GEN   trace-dtrace.dtrace")
140 140
	@cmp -s $@ trace-dtrace.dtrace || cp $@ trace-dtrace.dtrace
141 141

  
142 142
trace-dtrace.o: trace-dtrace.dtrace $(GENERATED_HEADERS)
......
160 160
qemu-io$(EXESUF): qemu-io.o cmd.o qemu-tool.o qemu-error.o $(oslib-obj-y) $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) qemu-timer-common.o
161 161

  
162 162
qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx
163
	$(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@,"  GEN   $@")
163
	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  GEN   $@")
164 164

  
165 165
check-qint.o check-qstring.o check-qdict.o check-qlist.o check-qfloat.o check-qjson.o: $(GENERATED_HEADERS)
166 166

  
......
282 282
	$(call quiet-command,texi2pdf $(TEXIFLAG) -I . $<,"  GEN   $@")
283 283

  
284 284
qemu-options.texi: $(SRC_PATH)/qemu-options.hx
285
	$(call quiet-command,sh $(SRC_PATH)/hxtool -t < $< > $@,"  GEN   $@")
285
	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"  GEN   $@")
286 286

  
287 287
qemu-monitor.texi: $(SRC_PATH)/hmp-commands.hx
288
	$(call quiet-command,sh $(SRC_PATH)/hxtool -t < $< > $@,"  GEN   $@")
288
	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"  GEN   $@")
289 289

  
290 290
QMP/qmp-commands.txt: $(SRC_PATH)/qmp-commands.hx
291
	$(call quiet-command,sh $(SRC_PATH)/hxtool -q < $< > $@,"  GEN   $@")
291
	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -q < $< > $@,"  GEN   $@")
292 292

  
293 293
qemu-img-cmds.texi: $(SRC_PATH)/qemu-img-cmds.hx
294
	$(call quiet-command,sh $(SRC_PATH)/hxtool -t < $< > $@,"  GEN   $@")
294
	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"  GEN   $@")
295 295

  
296 296
qemu.1: qemu-doc.texi qemu-options.texi qemu-monitor.texi
297 297
	$(call quiet-command, \
298
	  perl -Ww -- $(SRC_PATH)/texi2pod.pl $< qemu.pod && \
298
	  perl -Ww -- $(SRC_PATH)/scripts/texi2pod.pl $< qemu.pod && \
299 299
	  pod2man --section=1 --center=" " --release=" " qemu.pod > $@, \
300 300
	  "  GEN   $@")
301 301

  
302 302
qemu-img.1: qemu-img.texi qemu-img-cmds.texi
303 303
	$(call quiet-command, \
304
	  perl -Ww -- $(SRC_PATH)/texi2pod.pl $< qemu-img.pod && \
304
	  perl -Ww -- $(SRC_PATH)/scripts/texi2pod.pl $< qemu-img.pod && \
305 305
	  pod2man --section=1 --center=" " --release=" " qemu-img.pod > $@, \
306 306
	  "  GEN   $@")
307 307

  
308 308
qemu-nbd.8: qemu-nbd.texi
309 309
	$(call quiet-command, \
310
	  perl -Ww -- $(SRC_PATH)/texi2pod.pl $< qemu-nbd.pod && \
310
	  perl -Ww -- $(SRC_PATH)/scripts/texi2pod.pl $< qemu-nbd.pod && \
311 311
	  pod2man --section=8 --center=" " --release=" " qemu-nbd.pod > $@, \
312 312
	  "  GEN   $@")
313 313

  

Also available in: Unified diff