| Andrew Geissler | 5082cc7 | 2023-09-11 08:41:39 -0400 | [diff] [blame] | 1 | From dfd3ef4caac300f517f8eeb378f0b0f9ba6a9b06 Mon Sep 17 00:00:00 2001 |
| 2 | From: Markus Volk <f_l_k@t-online.de> |
| 3 | Date: Tue, 15 Aug 2023 15:41:03 +0200 |
| 4 | Subject: [PATCH] remove dropped gtkdoc templates |
| 5 | |
| 6 | Signed-off-by: Markus Volk <f_l_k@t-online.de> |
| 7 | |
| 8 | Upstream-Status: Pending |
| 9 | --- |
| 10 | --- a/gtkdoc/gtk-doc.make 2011-08-25 23:20:22.000000000 +0200 |
| 11 | +++ b/gtkdoc/gtk-doc.make 2023-08-15 18:08:02.430729073 +0200 |
| 12 | @@ -33,9 +33,9 @@ |
| 13 | $(HTML_IMAGES) \ |
| 14 | $(SETUP_FILES) |
| 15 | |
| 16 | -DOC_STAMPS=setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ |
| 17 | +DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \ |
| 18 | html-build.stamp pdf-build.stamp \ |
| 19 | - tmpl.stamp sgml.stamp html.stamp pdf.stamp |
| 20 | + sgml.stamp html.stamp pdf.stamp |
| 21 | |
| 22 | SCANOBJ_FILES = \ |
| 23 | $(DOC_MODULE).args \ |
| 24 | @@ -120,27 +120,12 @@ |
| 25 | $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp |
| 26 | @true |
| 27 | |
| 28 | -#### templates #### |
| 29 | - |
| 30 | -tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt |
| 31 | - @echo ' DOC Rebuilding template files' |
| 32 | - @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) |
| 33 | - @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ |
| 34 | - if test -w $(abs_srcdir) ; then \ |
| 35 | - cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ |
| 36 | - fi \ |
| 37 | - fi |
| 38 | - @touch tmpl-build.stamp |
| 39 | - |
| 40 | -tmpl.stamp: tmpl-build.stamp |
| 41 | - @true |
| 42 | - |
| 43 | $(srcdir)/tmpl/*.sgml: |
| 44 | @true |
| 45 | |
| 46 | #### xml #### |
| 47 | |
| 48 | -sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) |
| 49 | +sgml-build.stamp: $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) |
| 50 | @echo ' DOC Building XML' |
| 51 | @-chmod -R u+w $(srcdir) |
| 52 | @_source_dir='' ; \ |
| 53 | --- a/gtkdoc/Makefile.am 2009-01-21 21:52:46.000000000 +0100 |
| 54 | +++ b/gtkdoc/Makefile.am 2023-08-15 17:41:59.002498772 +0200 |
| 55 | @@ -31,10 +31,6 @@ |
| 56 | # e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml |
| 57 | MKDB_OPTIONS=--sgml-mode --output-format=xml |
| 58 | |
| 59 | -# Extra options to supply to gtkdoc-mktmpl |
| 60 | -# e.g. MKTMPL_OPTIONS=--only-section-tmpl |
| 61 | -MKTMPL_OPTIONS= |
| 62 | - |
| 63 | # Extra options to supply to gtkdoc-fixref. Not normally needed. |
| 64 | # e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html |
| 65 | FIXXREF_OPTIONS= |