Revision faf07963 Makefile

b/Makefile
13 13

  
14 14
CPPFLAGS += -I. -I$(SRC_PATH) -MMD -MP
15 15
CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
16
CPPFLAGS += -DQEMU_TOOL
17 16
LIBS=
18 17
ifdef CONFIG_STATIC
19 18
BASE_LDFLAGS += -static
......
33 32

  
34 33
recurse-all: $(patsubst %,subdir-%, $(TARGET_DIRS))
35 34

  
35
#######################################################################
36
# BLOCK_OBJS is code used by both qemu system emulation and qemu-img
37

  
38
BLOCK_OBJS=cutils.o
39
BLOCK_OBJS+=block-cow.o block-qcow.o aes.o block-vmdk.o block-cloop.o
40
BLOCK_OBJS+=block-dmg.o block-bochs.o block-vpc.o block-vvfat.o
41
BLOCK_OBJS+=block-qcow2.o block-parallels.o
42

  
36 43
######################################################################
37
# libqemu_common.a: target indepedent part of system emulation. The
44
# libqemu_common.a: Target indepedent part of system emulation. The
38 45
# long term path is to suppress *all* target specific code in case of
39 46
# system emulation, i.e. a single QEMU executable should support all
40 47
# CPUs and machines.
41 48

  
42
OBJS+=cutils.o readline.o console.o 
43
#OBJS+=block.o block-raw.o
44
OBJS+=block-cow.o block-qcow.o aes.o block-vmdk.o block-cloop.o block-dmg.o block-bochs.o block-vpc.o block-vvfat.o block-qcow2.o block-parallels.o
49
OBJS=$(BLOCK_OBJS)
50
OBJS+=readline.o console.o 
51
OBJS+=block.o
45 52

  
46 53
ifdef CONFIG_WIN32
47 54
OBJS+=tap-win32.o
......
105 112

  
106 113
######################################################################
107 114

  
108
qemu-img$(EXESUF): qemu-img.o block.o block-raw.o libqemu_common.a
115
qemu-img$(EXESUF): qemu-img.o qemu-img-block.o qemu-img-block-raw.o $(BLOCK_OBJS)
109 116
	$(CC) $(LDFLAGS) $(BASE_LDFLAGS) -o $@ $^ -lz $(LIBS)
110 117

  
118
qemu-img-%.o: %.c
119
	$(CC) $(CFLAGS) $(CPPFLAGS) -DQEMU_IMG $(BASE_CFLAGS) -c -o $@ $<
120

  
111 121
%.o: %.c
112 122
	$(CC) $(CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) -c -o $@ $<
113 123

  

Also available in: Unified diff