From nobody Tue Feb 10 08:27:18 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1558957370; cv=none; d=zoho.com; s=zohoarc; b=nYcBXrhuwkcuHSDhyBP4ln0ZGPl8OCFl3S/uq6FZFZrSrHOhqXap848tUnGf2OddPtdmiS5dFGHanaxhvpAAP6w0Uh9Fmn6pdYTGouW5aaeWx1l5xx7stWaVuWuKXfTQmn5tmejK01UF9+M02ZyIeuMPudOZolqA88ZCmIjlYis= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558957370; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=33PhXciMLdrYLWD7vxaUbGpEUpLEaFgXrqLRp2QV060=; b=GlvIim1ffDO0sKVuEYUS1SvSp4TzAFLEM77tzLamPpVSmb0syc6JxS1VtVsqFREV3I+S2HksbEpuA0eEjZ8G1G2qM2VlXtag9kDOesoXisOpbFNzi+IxHEbeJwb8PufiebLLVKqCzpHruxbFaq7vKj0rePj85wmpBXjhd+e1wEg= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1558957370203597.5730160451363; Mon, 27 May 2019 04:42:50 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AB205308FFB1; Mon, 27 May 2019 11:42:43 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 817CE19C7F; Mon, 27 May 2019 11:42:41 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 3E012206D6; Mon, 27 May 2019 11:42:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x4RBfe72025092 for ; Mon, 27 May 2019 07:41:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id DE93B60C75; Mon, 27 May 2019 11:41:40 +0000 (UTC) Received: from laerte.brq.redhat.com (unknown [10.43.2.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 40B7B60BEC; Mon, 27 May 2019 11:41:40 +0000 (UTC) From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= To: libvir-list@redhat.com Date: Mon, 27 May 2019 13:41:32 +0200 Message-Id: <20190527114132.30604-3-fidencio@redhat.com> In-Reply-To: <20190527114132.30604-1-fidencio@redhat.com> References: <20190527114132.30604-1-fidencio@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Subject: [libvirt] [glib PATCH v2 2/2] gtk-doc.make: Remove the file X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Mon, 27 May 2019 11:42:49 +0000 (UTC) Now that we're using gtkdocisze as part of autogen.sh, there's no reason to keep our own gtk-doc.make file. Signed-off-by: Fabiano Fid=C3=AAncio Reviewed-by: Andrea Bolognani --- .gitignore | 1 + gtk-doc.make | 256 --------------------------------------------------- 2 files changed, 1 insertion(+), 256 deletions(-) delete mode 100644 gtk-doc.make diff --git a/.gitignore b/.gitignore index 4b9467e..602a2d6 100644 --- a/.gitignore +++ b/.gitignore @@ -58,6 +58,7 @@ python/*pyc */*.gir */*.typelib build/ +gtk-doc.make libvirt-gconfig/libvirt-gconfig-enum-types.h libvirt-gconfig/libvirt-gconfig-enum-types.c libvirt-gobject/libvirt-gobject-enums.h diff --git a/gtk-doc.make b/gtk-doc.make deleted file mode 100644 index 9841de4..0000000 --- a/gtk-doc.make +++ /dev/null @@ -1,256 +0,0 @@ -# -*- mode: makefile -*- - -#################################### -# Everything below here is generic # -#################################### - -if GTK_DOC_USE_LIBTOOL -GTKDOC_CC =3D $(LIBTOOL) --tag=3DCC --mode=3Dcompile $(CC) $(INCLUDES) $(G= TKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD =3D $(LIBTOOL) --tag=3DCC --mode=3Dlink $(CC) $(GTKDOC_DEPS_LIBS= ) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -GTKDOC_RUN =3D $(LIBTOOL) --mode=3Dexecute -else -GTKDOC_CC =3D $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPP= FLAGS) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD =3D $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAG= S) $(LDFLAGS) -GTKDOC_RUN =3D -endif - -# We set GPATH here; this gives us semantics for GNU make -# which are more like other make's VPATH, when it comes to -# whether a source that is a target of one rule is then -# searched for in VPATH/GPATH. -# -GPATH =3D $(srcdir) - -TARGET_DIR=3D$(HTML_DIR)/$(DOC_MODULE) - -SETUP_FILES =3D \ - $(content_files) \ - $(DOC_MAIN_SGML_FILE) \ - $(DOC_MODULE)-sections.txt \ - $(DOC_MODULE)-overrides.txt - -EXTRA_DIST =3D \ - $(HTML_IMAGES) \ - $(SETUP_FILES) - -DOC_STAMPS=3Dsetup-build.stamp scan-build.stamp sgml-build.stamp \ - html-build.stamp pdf-build.stamp \ - sgml.stamp html.stamp pdf.stamp - -SCANOBJ_FILES =3D \ - $(DOC_MODULE).args \ - $(DOC_MODULE).hierarchy \ - $(DOC_MODULE).interfaces \ - $(DOC_MODULE).prerequisites \ - $(DOC_MODULE).signals - -REPORT_FILES =3D \ - $(DOC_MODULE)-undocumented.txt \ - $(DOC_MODULE)-undeclared.txt \ - $(DOC_MODULE)-unused.txt - -CLEANFILES =3D $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) - -if ENABLE_GTK_DOC -if GTK_DOC_BUILD_HTML -HTML_BUILD_STAMP=3Dhtml-build.stamp -else -HTML_BUILD_STAMP=3D -endif -if GTK_DOC_BUILD_PDF -PDF_BUILD_STAMP=3Dpdf-build.stamp -else -PDF_BUILD_STAMP=3D -endif - -all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) -else -all-local: -endif - -docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) - -$(REPORT_FILES): sgml-build.stamp - -#### setup #### - -setup-build.stamp: - -@if test "$(abs_srcdir)" !=3D "$(abs_builddir)" ; then \ - echo ' DOC Preparing build'; \ - files=3D`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).ty= pes`; \ - if test "x$$files" !=3D "x" ; then \ - for file in $$files ; do \ - test -f $(abs_srcdir)/$$file && \ - cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ - done; \ - fi; \ - fi - @touch setup-build.stamp - - -#### scan #### - -scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo ' DOC Scanning header files' - @_source_dir=3D'' ; \ - for i in $(DOC_SOURCE_DIR) ; do \ - _source_dir=3D"$${_source_dir} --source-dir=3D$$i" ; \ - done ; \ - gtkdoc-scan --module=3D$(DOC_MODULE) --ignore-headers=3D"$(IGNORE_HFILES)= " $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) - @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ - echo " DOC Introspecting gobjects"; \ - scanobj_options=3D""; \ - gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" =3D "0"; then \ - if test "x$(V)" =3D "x1"; then \ - scanobj_options=3D"--verbose"; \ - fi; \ - fi; \ - CC=3D"$(GTKDOC_CC)" LD=3D"$(GTKDOC_LD)" RUN=3D"$(GTKDOC_RUN)" CFLAGS= =3D"$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS=3D"$(GTKDOC_LIBS) $(LDFLAGS)" \ - gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=3D$(DO= C_MODULE); \ - else \ - for i in $(SCANOBJ_FILES) ; do \ - test -f $$i || touch $$i ; \ - done \ - fi - @touch scan-build.stamp - -$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_M= ODULE)-overrides.txt: scan-build.stamp - @true - -#### xml #### - -sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES= ) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_f= iles) - @echo ' DOC Building XML' - @_source_dir=3D'' ; \ - for i in $(DOC_SOURCE_DIR) ; do \ - _source_dir=3D"$${_source_dir} --source-dir=3D$$i" ; \ - done ; \ - gtkdoc-mkdb --module=3D$(DOC_MODULE) --output-format=3Dxml --expand-conte= nt-files=3D"$(expand_content_files)" --main-sgml-file=3D$(DOC_MAIN_SGML_FIL= E) $${_source_dir} $(MKDB_OPTIONS) - @touch sgml-build.stamp - -sgml.stamp: sgml-build.stamp - @true - -#### html #### - -html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building HTML' - @rm -rf html - @mkdir html - @mkhtml_options=3D""; \ - gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" =3D "0"; then \ - if test "x$(V)" =3D "x1"; then \ - mkhtml_options=3D"$$mkhtml_options --verbose"; \ - fi; \ - fi; \ - gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ - if test "$(?)" =3D "0"; then \ - mkhtml_options=3D"$$mkhtml_options --path=3D\"$(abs_srcdir)\""; \ - fi; \ - cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE)= ../$(DOC_MAIN_SGML_FILE) - -@test "x$(HTML_IMAGES)" =3D "x" || \ - for file in $(HTML_IMAGES) ; do \ - if test -f $(abs_srcdir)/$$file ; then \ - cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ - fi; \ - if test -f $(abs_builddir)/$$file ; then \ - cp $(abs_builddir)/$$file $(abs_builddir)/html; \ - fi; \ - done; - @echo ' DOC Fixing cross-references' - @gtkdoc-fixxref --module=3D$(DOC_MODULE) --module-dir=3Dhtml --html-dir= =3D$(HTML_DIR) $(FIXXREF_OPTIONS) - @touch html-build.stamp - -#### pdf #### - -pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building PDF' - @rm -f $(DOC_MODULE).pdf - @mkpdf_options=3D""; \ - gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" =3D "0"; then \ - if test "x$(V)" =3D "x1"; then \ - mkpdf_options=3D"$$mkpdf_options --verbose"; \ - fi; \ - fi; \ - if test "x$(HTML_IMAGES)" !=3D "x"; then \ - for img in $(HTML_IMAGES); do \ - part=3D`dirname $$img`; \ - echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=3D$$part "; \ - if test $$? !=3D 0; then \ - mkpdf_options=3D"$$mkpdf_options --imgdir=3D$$part"; \ - fi; \ - done; \ - fi; \ - gtkdoc-mkpdf --path=3D"$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC= _MAIN_SGML_FILE) $(MKPDF_OPTIONS) - @touch pdf-build.stamp - -############## - -clean-local: - @rm -f *~ *.bak - @rm -rf .libs - -distclean-local: - @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ - $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt - @if test "$(abs_srcdir)" !=3D "$(abs_builddir)" ; then \ - rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ - fi - -maintainer-clean-local: clean - @rm -rf xml html - -install-data-local: - @installfiles=3D`echo $(builddir)/html/*`; \ - if test "$$installfiles" =3D '$(builddir)/html/*'; \ - then echo 1>&2 'Nothing to install' ; \ - else \ - if test -n "$(DOC_MODULE_VERSION)"; then \ - installdir=3D"$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ - else \ - installdir=3D"$(DESTDIR)$(TARGET_DIR)"; \ - fi; \ - $(mkinstalldirs) $${installdir} ; \ - for i in $$installfiles; do \ - echo ' $(INSTALL_DATA) '$$i ; \ - $(INSTALL_DATA) $$i $${installdir}; \ - done; \ - if test -n "$(DOC_MODULE_VERSION)"; then \ - mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ - $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ - fi; \ - $(GTKDOC_REBASE) --relative --dest-dir=3D$(DESTDIR) --html-dir=3D$${ins= talldir}; \ - fi - -uninstall-local: - @if test -n "$(DOC_MODULE_VERSION)"; then \ - installdir=3D"$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ - else \ - installdir=3D"$(DESTDIR)$(TARGET_DIR)"; \ - fi; \ - rm -rf $${installdir} - -# -# Require gtk-doc when making dist -# -if ENABLE_GTK_DOC -dist-check-gtkdoc: -else -dist-check-gtkdoc: - @echo "*** gtk-doc must be installed and enabled in order to make dist" - @false -endif - -dist-hook: dist-check-gtkdoc dist-hook-local - @mkdir $(distdir)/html - @cp ./html/* $(distdir)/html - @-cp ./$(DOC_MODULE).pdf $(distdir)/ - @-cp ./$(DOC_MODULE).types $(distdir)/ - @-cp ./$(DOC_MODULE)-sections.txt $(distdir)/ - @cd $(distdir) && rm -f $(DISTCLEANFILES) - @$(GTKDOC_REBASE) --online --relative --html-dir=3D$(distdir)/html - -.PHONY : dist-hook-local docs --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list