From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7D47EC43603 for ; Thu, 19 Dec 2019 12:48:09 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 39B25206D7 for ; Thu, 19 Dec 2019 12:48:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Agv8BDwD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 39B25206D7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40386 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihvDr-0004yb-Sc for qemu-devel@archiver.kernel.org; Thu, 19 Dec 2019 07:48:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35873) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihurx-0000VG-9a for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihurq-0002Iv-KT for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:28 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:41209 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihurp-0002Fu-Pv for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lLCOLGc9HCwQfuDdNFFvWe1ryUt857w2OCIR1OAe89s=; b=Agv8BDwD5XlpNejOJ2J0bIojyQxwAUNzfHnIr2t7RVV/2UZsRy8Cw560UudgcXbo1gj9z+ qvc7TJHDCRhiDUx/rvXnyL4Erv2ZOspP1CjetjxKtaU1gF7qJc3aVMhp+Ca8rFKOWYYDuL OjG5ZO7zXTnjXW1J1swniQp1WefK2dI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-45-dQ1CxBNONDCAo45GkHnWkQ-1; Thu, 19 Dec 2019 07:25:15 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6F828107ACC4 for ; Thu, 19 Dec 2019 12:25:14 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3011660C18; Thu, 19 Dec 2019 12:25:12 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 118/132] meson: build texi doc Date: Thu, 19 Dec 2019 13:23:38 +0100 Message-Id: <1576758232-12439-27-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: dQ1CxBNONDCAo45GkHnWkQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau --- Makefile | 139 ++-----------------------------------= ---- docs/interop/qemu-ga-ref.texi | 2 +- docs/interop/qemu-qmp-ref.texi | 2 +- docs/meson.build | 1 + meson.build | 117 +++++++++++++++++++++++++++++++++- rules.mak | 12 ---- 6 files changed, 125 insertions(+), 148 deletions(-) diff --git a/Makefile b/Makefile index c1ea39f..ac21e14 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,6 @@ BUILD_DIR=3D$(CURDIR) SRC_PATH=3D. =20 UNCHECKED_GOALS :=3D %clean TAGS cscope ctags dist \ - html info pdf txt \ help check-help print-% \ docker docker-% vm-help vm-test vm-build-% =20 @@ -106,29 +105,13 @@ edk2-decompressed =3D $(basename $(wildcard pc-bios/e= dk2-*.fd.bz2)) Makefile: ; configure: ; =20 -.PHONY: all clean cscope distclean html info install install-doc \ -=09pdf txt recurse-all dist msi FORCE +.PHONY: all clean cscope distclean install \ +=09recurse-all dist msi FORCE =20 $(call set-vpath, $(SRC_PATH)) =20 LIBS+=3D-lz $(LIBS_TOOLS) =20 -ifdef BUILD_DOCS -DOCS=3Dqemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8 -DOCS+=3Ddocs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.txt docs/= interop/qemu-qmp-ref.7 -DOCS+=3Ddocs/interop/qemu-ga-ref.html docs/interop/qemu-ga-ref.txt docs/in= terop/qemu-ga-ref.7 -DOCS+=3Ddocs/qemu-block-drivers.7 -DOCS+=3Ddocs/qemu-cpu-models.7 -ifdef CONFIG_VIRTFS -DOCS+=3Dfsdev/virtfs-proxy-helper.1 -endif -ifdef CONFIG_TRACE_SYSTEMTAP -DOCS+=3Dscripts/qemu-trace-stap.1 -endif -else -DOCS=3D -endif - SUBDIR_MAKEFLAGS=3D$(if $(V),,--no-print-directory --quiet) BUILD_DIR=3D$(= BUILD_DIR) =20 ifneq ($(wildcard config-host.mak),) @@ -137,7 +120,7 @@ endif =20 include $(SRC_PATH)/tests/Makefile.include =20 -all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) recurse-all modules +all: recurse-all modules =20 DTC_MAKE_ARGS=3D-I$(SRC_PATH)/dtc VPATH=3D$(SRC_PATH)/dtc -C dtc V=3D"$(V)= " LIBFDT_srcdir=3D$(SRC_PATH)/dtc/libfdt DTC_CFLAGS=3D$(CFLAGS) $(QEMU_CFLAGS) @@ -225,25 +208,13 @@ qemu-%.tar.bz2: =09$(SRC_PATH)/scripts/make-release "$(SRC_PATH)" "$(patsubst qemu-%.tar.b= z2,%,$@)" =20 distclean: clean -=09rm -f config-host.mak config-host.h* config-host.ld $(DOCS) qemu-option= s.texi qemu-img-cmds.texi qemu-monitor.texi qemu-monitor-info.texi +=09rm -f config-host.mak config-host.h* config-host.ld =09rm -f tests/tcg/config-*.mak =09rm -f config-all-disas.mak config.status =09rm -f po/*.mo tests/qemu-iotests/common.env =09rm -f roms/seabios/config.mak roms/vgabios/config.mak -=09rm -f qemu-doc.info qemu-doc.aux qemu-doc.cp qemu-doc.cps -=09rm -f qemu-doc.fn qemu-doc.fns qemu-doc.info qemu-doc.ky qemu-doc.kys -=09rm -f qemu-doc.log qemu-doc.pdf qemu-doc.pg qemu-doc.toc qemu-doc.tp -=09rm -f qemu-doc.vr qemu-doc.txt =09rm -f config.log =09rm -f linux-headers/asm -=09rm -f docs/version.texi -=09rm -f docs/interop/qemu-ga-qapi.texi docs/interop/qemu-qmp-qapi.texi -=09rm -f docs/interop/qemu-qmp-ref.7 docs/interop/qemu-ga-ref.7 -=09rm -f docs/interop/qemu-qmp-ref.txt docs/interop/qemu-ga-ref.txt -=09rm -f docs/interop/qemu-qmp-ref.pdf docs/interop/qemu-ga-ref.pdf -=09rm -f docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html -=09rm -f docs/qemu-block-drivers.7 -=09rm -f docs/qemu-cpu-models.7 =09rm -Rf .sdk =09if test -f dtc/version_gen.h; then $(MAKE) $(DTC_MAKE_ARGS) clean; fi =20 @@ -283,39 +254,6 @@ BLOBS=3D DESCS=3D endif =20 -install-doc: $(DOCS) -=09$(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)" -=09$(INSTALL_DATA) qemu-doc.html "$(DESTDIR)$(qemu_docdir)" -=09$(INSTALL_DATA) qemu-doc.txt "$(DESTDIR)$(qemu_docdir)" -=09$(INSTALL_DATA) docs/interop/qemu-qmp-ref.html "$(DESTDIR)$(qemu_docdir= )" -=09$(INSTALL_DATA) docs/interop/qemu-qmp-ref.txt "$(DESTDIR)$(qemu_docdir)= " -ifdef CONFIG_POSIX -=09$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" -=09$(INSTALL_DATA) qemu.1 "$(DESTDIR)$(mandir)/man1" -=09$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man7" -=09$(INSTALL_DATA) docs/interop/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7" -=09$(INSTALL_DATA) docs/qemu-block-drivers.7 "$(DESTDIR)$(mandir)/man7" -=09$(INSTALL_DATA) docs/qemu-cpu-models.7 "$(DESTDIR)$(mandir)/man7" -ifeq ($(CONFIG_TOOLS),y) -=09$(INSTALL_DATA) qemu-img.1 "$(DESTDIR)$(mandir)/man1" -=09$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man8" -=09$(INSTALL_DATA) qemu-nbd.8 "$(DESTDIR)$(mandir)/man8" -endif -ifdef CONFIG_TRACE_SYSTEMTAP -=09$(INSTALL_DATA) scripts/qemu-trace-stap.1 "$(DESTDIR)$(mandir)/man1" -endif -ifeq ($(CONFIG_GUEST_AGENT),y) -=09$(INSTALL_DATA) qemu-ga.8 "$(DESTDIR)$(mandir)/man8" -=09$(INSTALL_DATA) docs/interop/qemu-ga-ref.html "$(DESTDIR)$(qemu_docdir)= " -=09$(INSTALL_DATA) docs/interop/qemu-ga-ref.txt "$(DESTDIR)$(qemu_docdir)" -=09$(INSTALL_DATA) docs/interop/qemu-ga-ref.7 "$(DESTDIR)$(mandir)/man7" -endif -endif -ifdef CONFIG_VIRTFS -=09$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" -=09$(INSTALL_DATA) fsdev/virtfs-proxy-helper.1 "$(DESTDIR)$(mandir)/man1" -endif - install-datadir: =09$(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)" =20 @@ -328,7 +266,7 @@ endif =20 ICON_SIZES=3D16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512 =20 -install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-local= statedir \ +install: all install-datadir install-localstatedir \ =09$(if $(INSTALL_BLOBS),$(edk2-decompressed)) \ =09recurse-install ifneq ($(vhost-user-json-y),) @@ -397,67 +335,6 @@ cscope: =09find "$(SRC_PATH)/" -name "*.[chsS]" -print | sed 's,^\./,,' > "$(SRC_P= ATH)/cscope.files" =09cscope -b -i"$(SRC_PATH)/cscope.files" =20 -# documentation -MAKEINFO=3Dmakeinfo -MAKEINFOINCLUDES=3D -I docs -I $( $@, \ -=09"GEN","$@") - -%.1: -=09$(call TEXI2MAN) -%.7: -=09$(call TEXI2MAN) -%.8: -=09$(call TEXI2MAN) --=20 1.8.3.1