Revision 03ff3ca3 Makefile

b/Makefile
28 28
LIBS+=-lsocket -lnsl -lresolv
29 29
endif
30 30

  
31
ifdef CONFIG_WIN32
32
LIBS+=-lwinmm -lws2_32 -liphlpapi
33
endif
34

  
31 35
all: $(TOOLS) $(DOCS) recurse-all 
32 36

  
33 37
SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))
......
46 50
BLOCK_OBJS=cutils.o qemu-malloc.o
47 51
BLOCK_OBJS+=block-cow.o block-qcow.o aes.o block-vmdk.o block-cloop.o
48 52
BLOCK_OBJS+=block-dmg.o block-bochs.o block-vpc.o block-vvfat.o
49
BLOCK_OBJS+=block-qcow2.o block-parallels.o
50
ifndef CONFIG_WIN32
51
BLOCK_OBJS+=block-nbd.o
53
BLOCK_OBJS+=block-qcow2.o block-parallels.o block-nbd.o
54
BLOCK_OBJS+=nbd.o block.o
55

  
56
ifdef CONFIG_WIN32
57
BLOCK_OBJS += block-raw-win32.o
58
else
59
BLOCK_OBJS += block-raw-posix.o
60
endif
61

  
62
ifdef CONFIG_AIO
63
BLOCK_OBJS += compatfd.o
52 64
endif
53 65

  
54 66
######################################################################
......
59 71

  
60 72
OBJS=$(BLOCK_OBJS)
61 73
OBJS+=readline.o console.o
62
OBJS+=block.o
63

  
64
ifndef CONFIG_WIN32
65
OBJS+=nbd.o
66
endif
67 74

  
68 75
OBJS+=irq.o
69 76
OBJS+=i2c.o smbus.o smbus_eeprom.o max7310.o max111x.o wm8750.o
......
173 180
	rm -f $@ 
174 181
	$(AR) rcs $@ $(USER_OBJS)
175 182

  
176
QEMU_IMG_BLOCK_OBJS = $(BLOCK_OBJS)
177
ifdef CONFIG_WIN32
178
QEMU_IMG_BLOCK_OBJS += qemu-img-block-raw-win32.o
179
else
180
QEMU_IMG_BLOCK_OBJS += nbd.o qemu-img-block-raw-posix.o
181
endif
182

  
183
ifdef CONFIG_AIO
184
QEMU_IMG_BLOCK_OBJS += compatfd.o
185
endif
186

  
187 183
######################################################################
188 184

  
189
qemu-img$(EXESUF): qemu-img.o qemu-img-block.o $(QEMU_IMG_BLOCK_OBJS)
185
qemu-img$(EXESUF): qemu-img.o qemu-tool.o osdep.o $(BLOCK_OBJS)
190 186
	$(CC) $(LDFLAGS) -o $@ $^ -lz $(LIBS)
191 187

  
192
qemu-img-%.o: %.c
193
	$(CC) $(CFLAGS) $(CPPFLAGS) -DQEMU_IMG -c -o $@ $<
194

  
195 188
%.o: %.c
196 189
	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
197 190

  
198
qemu-nbd-%.o: %.c
199
	$(CC) $(CFLAGS) $(CPPFLAGS) -DQEMU_NBD -c -o $@ $<
200

  
201
qemu-nbd$(EXESUF):  qemu-nbd.o qemu-nbd-nbd.o qemu-img-block.o \
202
		    osdep.o qemu-nbd-block-raw-posix.o compatfd.o $(BLOCK_OBJS)
191
qemu-nbd$(EXESUF):  qemu-nbd.o qemu-tool.o osdep.o $(BLOCK_OBJS)
203 192
	$(CC) $(LDFLAGS) -o $@ $^ -lz $(LIBS)
204 193

  
205 194
# dyngen host tool

Also available in: Unified diff