Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 157987 | Differences between
and this patch

Collapse All | Expand All

(-)kvm-45/qemu/Makefile.orig (-14 / +5 lines)
Lines 17-46 Link Here
17
BASE_LDFLAGS += -static
17
BASE_LDFLAGS += -static
18
endif
18
endif
19
ifdef BUILD_DOCS
19
ifdef BUILD_DOCS
20
DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1
20
DOCS=qemu-doc.html qemu-tech.html qemu.1
21
else
21
else
22
DOCS=
22
DOCS=
23
endif
23
endif
24
24
25
LIBS+=$(AIOLIBS)
25
LIBS+=$(AIOLIBS)
26
26
27
all: $(TOOLS) $(DOCS) recurse-all
27
all: $(DOCS) recurse-all
28
28
29
subdir-%: dyngen$(EXESUF)
29
subdir-%: dyngen$(EXESUF)
30
	$(MAKE) -C $(subst subdir-,,$@) all
30
	$(MAKE) -C $(subst subdir-,,$@) all
31
31
32
recurse-all: $(patsubst %,subdir-%, $(TARGET_DIRS))
32
recurse-all: $(patsubst %,subdir-%, $(TARGET_DIRS))
33
33
34
qemu-img$(EXESUF): qemu-img.c cutils.c block.c block-raw.c block-cow.c block-qcow.c aes.c block-vmdk.c block-cloop.c block-dmg.c block-bochs.c block-vpc.c block-vvfat.c block-qcow2.c block-parallels.c
35
	$(CC) -DQEMU_TOOL $(CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) $(LDFLAGS) $(BASE_LDFLAGS) -o $@ $^ -lz $(LIBS)
36
37
dyngen$(EXESUF): dyngen.c
34
dyngen$(EXESUF): dyngen.c
38
	$(HOST_CC) $(CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) -o $@ $^
35
	$(HOST_CC) $(CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) -o $@ $^
39
36
40
clean:
37
clean:
41
# avoid old build problems by removing potentially incorrect old files
38
# avoid old build problems by removing potentially incorrect old files
42
	rm -f config.mak config.h op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
39
	rm -f config.mak config.h op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
43
	rm -f *.o *.a $(TOOLS) dyngen$(EXESUF) TAGS cscope.* *.pod *~ */*~
40
	rm -f *.o *.a dyngen$(EXESUF) TAGS cscope.* *.pod *~ */*~
44
	$(MAKE) -C tests clean
41
	$(MAKE) -C tests clean
45
	for d in $(TARGET_DIRS); do \
42
	for d in $(TARGET_DIRS); do \
46
	$(MAKE) -C $$d $@ || exit 1 ; \
43
	$(MAKE) -C $$d $@ || exit 1 ; \
Lines 62-73 Link Here
62
	$(INSTALL) -m 644 qemu-doc.html  qemu-tech.html "$(DESTDIR)$(docdir)"
59
	$(INSTALL) -m 644 qemu-doc.html  qemu-tech.html "$(DESTDIR)$(docdir)"
63
ifndef CONFIG_WIN32
60
ifndef CONFIG_WIN32
64
	mkdir -p "$(DESTDIR)$(mandir)/man1"
61
	mkdir -p "$(DESTDIR)$(mandir)/man1"
65
	$(INSTALL) qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1"
62
	$(INSTALL) qemu.1 "$(DESTDIR)$(mandir)/man1"
66
endif
63
endif
67
64
68
install: all $(if $(BUILD_DOCS),install-doc)
65
install: all $(if $(BUILD_DOCS),install-doc)
69
	mkdir -p "$(DESTDIR)$(bindir)"
66
	mkdir -p "$(DESTDIR)$(bindir)"
70
	$(INSTALL) -m 755 $(TOOLS) "$(DESTDIR)$(bindir)"
71
	mkdir -p "$(DESTDIR)$(datadir)"
67
	mkdir -p "$(DESTDIR)$(datadir)"
72
	for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \
68
	for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \
73
		video.x openbios-sparc32 pxe-ne2k_pci.bin \
69
		video.x openbios-sparc32 pxe-ne2k_pci.bin \
Lines 110-119 Link Here
110
	$(SRC_PATH)/texi2pod.pl $< qemu.pod
106
	$(SRC_PATH)/texi2pod.pl $< qemu.pod
111
	pod2man --section=1 --center=" " --release=" " qemu.pod > $@
107
	pod2man --section=1 --center=" " --release=" " qemu.pod > $@
112
108
113
qemu-img.1: qemu-img.texi
114
	$(SRC_PATH)/texi2pod.pl $< qemu-img.pod
115
	pod2man --section=1 --center=" " --release=" " qemu-img.pod > $@
116
117
info: qemu-doc.info qemu-tech.info
109
info: qemu-doc.info qemu-tech.info
118
110
119
dvi: qemu-doc.dvi qemu-tech.dvi
111
dvi: qemu-doc.dvi qemu-tech.dvi
Lines 161-167 Link Here
161
        $(bindir)/qemu-alpha \
153
        $(bindir)/qemu-alpha \
162
        $(bindir)/qemu-m68k \
154
        $(bindir)/qemu-m68k \
163
        $(bindir)/qemu-sh4 \
155
        $(bindir)/qemu-sh4 \
164
        $(bindir)/qemu-img \
165
	$(datadir)/bios.bin \
156
	$(datadir)/bios.bin \
166
	$(datadir)/vgabios.bin \
157
	$(datadir)/vgabios.bin \
167
	$(datadir)/vgabios-cirrus.bin \
158
	$(datadir)/vgabios-cirrus.bin \
Lines 173-179 Link Here
173
        $(datadir)/pxe-pcnet.bin \
164
        $(datadir)/pxe-pcnet.bin \
174
	$(docdir)/qemu-doc.html \
165
	$(docdir)/qemu-doc.html \
175
	$(docdir)/qemu-tech.html \
166
	$(docdir)/qemu-tech.html \
176
	$(mandir)/man1/qemu.1 $(mandir)/man1/qemu-img.1 )
167
	$(mandir)/man1/qemu.1
177
168
178
ifneq ($(wildcard .depend),)
169
ifneq ($(wildcard .depend),)
179
include .depend
170
include .depend

Return to bug 157987