hw/eeprom93xx.c: substitute structure dump with discrete dump in eeprom_save/load

[qemu] / Makefile

diff --git a/Makefile b/Makefile
index e9a75c4..2bee52c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -144,7 +144,7 @@ endif
 ifdef CONFIG_CURSES
 OBJS+=curses.o
 endif
-OBJS+=vnc.o d3des.o
+OBJS+=vnc.o acl.o d3des.o
 ifdef CONFIG_VNC_TLS
 OBJS+=vnc-tls.o vnc-auth-vencrypt.o
 endif
@@ -174,9 +174,11 @@ sdl.o: sdl.c keymaps.h sdl_keysym.h
 
 sdl.o audio/sdlaudio.o: CFLAGS += $(SDL_CFLAGS)
 
+acl.o: acl.h acl.c
+
 vnc.h: vnc-tls.h vnc-auth-vencrypt.h vnc-auth-sasl.h keymaps.h
 
-vnc.o: vnc.c vnc.h vnc_keysym.h vnchextile.h d3des.c d3des.h
+vnc.o: vnc.c vnc.h vnc_keysym.h vnchextile.h d3des.c d3des.h acl.h
 
 vnc.o: CFLAGS += $(CONFIG_VNC_TLS_CFLAGS)
 
@@ -281,24 +283,27 @@ cscope:
 
 # documentation
 %.html: %.texi
-       texi2html -monolithic -number $<
+       texi2html -I=. -monolithic -number $<
 
 %.info: %.texi
-       makeinfo $< -o $@
+       makeinfo -I . $< -o $@
 
 %.dvi: %.texi
-       texi2dvi $<
+       texi2dvi -I . $<
+
+qemu-options.texi: $(SRC_PATH)/qemu-options.hx
+       sh $(SRC_PATH)/hxtool -t < $< > $@
 
 qemu.1: qemu-doc.texi
-       $(SRC_PATH)/texi2pod.pl $< qemu.pod
+       perl -Ww -- $(SRC_PATH)/texi2pod.pl $< qemu.pod
        pod2man --section=1 --center=" " --release=" " qemu.pod > $@
 
 qemu-img.1: qemu-img.texi
-       $(SRC_PATH)/texi2pod.pl $< qemu-img.pod
+       perl -Ww -- $(SRC_PATH)/texi2pod.pl $< qemu-img.pod
        pod2man --section=1 --center=" " --release=" " qemu-img.pod > $@
 
 qemu-nbd.8: qemu-nbd.texi
-       $(SRC_PATH)/texi2pod.pl $< qemu-nbd.pod
+       perl -Ww -- $(SRC_PATH)/texi2pod.pl $< qemu-nbd.pod
        pod2man --section=8 --center=" " --release=" " qemu-nbd.pod > $@
 
 info: qemu-doc.info qemu-tech.info
@@ -307,7 +312,7 @@ dvi: qemu-doc.dvi qemu-tech.dvi
 
 html: qemu-doc.html qemu-tech.html
 
-qemu-doc.dvi qemu-doc.html qemu-doc.info: qemu-img.texi qemu-nbd.texi
+qemu-doc.dvi qemu-doc.html qemu-doc.info: qemu-img.texi qemu-nbd.texi qemu-options.texi
 
 VERSION ?= $(shell cat VERSION)
 FILE = qemu-$(VERSION)