Revision 7b93fadf Makefile

b/Makefile
36 36

  
37 37
LIBS+=-lz $(LIBS_TOOLS)
38 38

  
39
HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF)
40

  
39 41
ifdef BUILD_DOCS
40 42
DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 QMP/qmp-commands.txt
41 43
DOCS+=fsdev/virtfs-proxy-helper.1
......
77 79

  
78 80
-include config-all-devices.mak
79 81

  
80
build-all: $(DOCS) $(TOOLS) recurse-all
82
build-all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all
81 83

  
82 84
config-host.h: config-host.h-timestamp
83 85
config-host.h-timestamp: config-host.mak
......
158 160
qemu-nbd$(EXESUF): qemu-nbd.o $(tools-obj-y) $(block-obj-y)
159 161
qemu-io$(EXESUF): qemu-io.o cmd.o $(tools-obj-y) $(block-obj-y)
160 162

  
163
qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o
164

  
161 165
fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/virtio-9p-marshal.o oslib-posix.o $(trace-obj-y)
162 166
fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap
163 167

  
......
207 211
# avoid old build problems by removing potentially incorrect old files
208 212
	rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
209 213
	rm -f qemu-options.def
210
	rm -f *.o *.d *.a *.lo $(TOOLS) qemu-ga TAGS cscope.* *.pod *~ */*~
214
	rm -f *.o *.d *.a *.lo $(TOOLS) $(HELPERS-y) qemu-ga TAGS cscope.* *.pod *~ */*~
211 215
	rm -Rf .libs
212 216
	rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d net/*.o net/*.d fsdev/*.o fsdev/*.d ui/*.o ui/*.d qapi/*.o qapi/*.d qga/*.o qga/*.d
213 217
	rm -f qemu-img-cmds.h
......
281 285
ifneq ($(TOOLS),)
282 286
	$(INSTALL_PROG) $(STRIP_OPT) $(TOOLS) "$(DESTDIR)$(bindir)"
283 287
endif
288
ifneq ($(HELPERS-y),)
289
	$(INSTALL_DIR) "$(DESTDIR)$(libexecdir)"
290
	$(INSTALL_PROG) $(STRIP_OPT) $(HELPERS-y) "$(DESTDIR)$(libexecdir)"
291
endif
284 292
ifneq ($(BLOBS),)
285 293
	$(INSTALL_DIR) "$(DESTDIR)$(datadir)"
286 294
	set -e; for x in $(BLOBS); do \

Also available in: Unified diff