From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FfEKt-0003r8-22
	for qemu-devel@nongnu.org; Sun, 14 May 2006 07:00:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FfEKs-0003pv-3K
	for qemu-devel@nongnu.org; Sun, 14 May 2006 07:00:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FfEKr-0003pf-U0
	for qemu-devel@nongnu.org; Sun, 14 May 2006 07:00:29 -0400
Received: from [212.227.126.183] (helo=moutng.kundenserver.de)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FfEN2-0006O4-6s
	for qemu-devel@nongnu.org; Sun, 14 May 2006 07:02:44 -0400
Received: from [127.0.0.1] (localhost [127.0.0.1])
	by flubber.weilnetz.de (Postfix) with ESMTP id B7D7BF2C46
	for <qemu-devel@nongnu.org>; Sun, 14 May 2006 13:00:11 +0200 (CEST)
Message-ID: <44670DBA.30806@mail.berlios.de>
Date: Sun, 14 May 2006 13:00:10 +0200
From: Stefan Weil <weil@mail.berlios.de>
MIME-Version: 1.0
Subject: [Qemu-devel][PATCH]Makefile targets for new documentation formats
Content-Type: text/plain; charset=ISO-8859-15; format=flowed
Content-Transfer-Encoding: 7bit
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

The patch enhances the Makefile with new targets
(and ignores these targets and intermediate files for CVS):

make info - create documentation in info format
make dvi  - create documentation in dvi format

It also fixes some minor issues in Makefile:

* Missing config-host.mak still allows calling make,
 e.g. for make distclean.

* Added .PHONY for GNU make.

Regards
Stefan

diff -u -b -B -u -r1.13 .cvsignore
--- .cvsignore    30 Apr 2006 21:33:34 -0000    1.13
+++ .cvsignore    14 May 2006 10:42:47 -0000
@@ -11,6 +11,8 @@
ppc-user
qemu-doc.html
qemu-tech.html
+qemu-doc.info
+qemu-tech.info
qemu.1
qemu.pod
qemu-img.1
@@ -25,5 +27,16 @@
mipsel-softmmu
mips-user
mipsel-user
+.gdbinit
sh4-user
sh4-softmmu
+*.aux
+*.cp
+*.dvi
+*.fn
+*.ky
+*.log
+*.pg
+*.toc
+*.tp
+*.vr
Index: Makefile
===================================================================
RCS file: /sources/qemu/qemu/Makefile,v
retrieving revision 1.101
diff -u -b -B -u -r1.101 Makefile
--- Makefile    13 May 2006 16:54:03 -0000    1.101
+++ Makefile    14 May 2006 10:42:47 -0000
@@ -1,4 +1,8 @@
-include config-host.mak
+# Makefile for QEMU.
+
+-include config-host.mak
+
+.PHONY:    all clean distclean dvi info install install-doc tar tarbin 
speed test test2

CFLAGS=-Wall -O2 -g -fno-strict-aliasing -I.
ifdef CONFIG_DARWIN
@@ -41,6 +45,8 @@

distclean: clean
    rm -f config-host.mak config-host.h $(DOCS)
+    rm -f qemu-doc.{aux,cp,dvi,fn,info,ky,log,pg,toc,tp,vr}
+    rm -f qemu-tech.{aux,cp,dvi,fn,info,ky,log,pg,toc,tp,vr}
    for d in $(TARGET_DIRS); do \
    rm -rf $$d || exit 1 ; \
        done
@@ -97,6 +103,10 @@
%.dvi: %.texi
    texi2dvi $<

+info:    qemu-doc.info qemu-tech.info
+
+dvi:    qemu-doc.dvi qemu-tech.dvi
+
qemu.1: qemu-doc.texi
    $(SRC_PATH)/texi2pod.pl $< qemu.pod
    pod2man --section=1 --center=" " --release=" " qemu.pod > $@