[gtk-doc] mktmpl: remove the support for tmpl files

From: Stefan Sauer <stefkost src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk-doc] mktmpl: remove the support for tmpl files
Date: Tue, 21 Mar 2017 20:30:16 +0000 (UTC)
commit 46df4354abed5724697fd5e39630c5bbc6637cc4
Author: Stefan Sauer <ensonic users sf net>
Date:   Tue Mar 21 20:53:16 2017 +0100

    mktmpl: remove the support for tmpl files
    
    We deprecated this many years ago. Now finally remove it.

 Makefile.am                                 |    8 -
 NEWS                                        |    2 +
 README                                      |    5 +-
 configure.ac                                |    1 -
 doc/design-2.x.txt                          |    9 +-
 gtk-doc.make                                |   35 +-
 gtk-doc.notmpl.make                         |  299 -------
 gtkdoc-mkdb.in                              |    8 -
 gtkdoc-mktmpl.in                            | 1274 ---------------------------
 gtkdocize.in                                |   10 +-
 help/manual/C/README                        |    4 -
 help/manual/C/index.docbook                 |   57 +-
 tests/annotations/docs/Makefile.am          |    6 +-
 tests/bugs/docs/Makefile.am                 |    6 +-
 tests/empty/docs/Makefile.am                |    6 +-
 tests/fail/docs/Makefile.am                 |    5 +-
 tests/gobject/docs/Makefile.am              |    6 +-
 tests/{gtk-doc.notmpl.make => gtk-doc.make} |    1 -
 tests/program/docs/Makefile.am              |    6 +-
 tests/tools.sh.in                           |    2 +-
 20 files changed, 39 insertions(+), 1711 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index cadb286..03641be 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,6 @@ bin_SCRIPTS = \
        gtkdoc-mkhtml   \
        gtkdoc-mkman    \
        gtkdoc-mkpdf    \
-       gtkdoc-mktmpl   \
        gtkdoc-rebase   \
        gtkdoc-scan     \
        gtkdoc-scangobj \
@@ -31,9 +30,7 @@ gtkdocdata_DATA = \
        devhelp2.xsd            \
        devhelp2.xsl            \
        gtk-doc.make            \
-       gtk-doc.notmpl.make     \
        gtk-doc.flat.make       \
-       gtk-doc.notmpl-flat.make        \
        style/home.png                  \
        style/left.png                  \
        style/left-insensitive.png              \
@@ -55,9 +52,6 @@ sgml_DATA = gtk-doc.cat
 gtk-doc.flat.make: gtk-doc.make
        @$(SED) -e "s/EXTRA_DIST =/EXTRA_DIST +=/" $< >$@
 
-gtk-doc.notmpl-flat.make: gtk-doc.notmpl.make
-       @$(SED) -e "s/EXTRA_DIST =/EXTRA_DIST +=/" $< >$@
-
 EXTRA_DIST = \
        MAINTAINERS     \
        $(gtkdocdata_DATA) \
@@ -85,7 +79,6 @@ EXTRA_DIST = \
 
 CLEANFILES = \
   gtk-doc.flat.make \
-  gtk-doc.notmpl-flat.make \
   gtkdoc-depscanc
 
 DISTCLEANFILES = \
@@ -100,7 +93,6 @@ DISTCLEANFILES = \
   gtkdoc-mkhtml \
   gtkdoc-mkman \
   gtkdoc-mkpdf \
-  gtkdoc-mktmpl \
   gtk-doc.pc \
   gtkdoc-rebase \
   gtkdoc-scangobj \
diff --git a/NEWS b/NEWS
index 67b8e01..8915c7a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 GTK-Doc 1.25.1  (... .. ....)
 ==============
 
+Remove tmpl support (gtkdoc-mktmpl).
+
 GTK-Doc 1.25  (Mar 21 2016)
 ==============
 
diff --git a/README b/README
index 51d35ea..1c89a7c 100644
--- a/README
+++ b/README
@@ -25,9 +25,8 @@ The generated HTML documentation can be browsed in an ordinary web browser or
 by using the special Devhelp API browser
 (see http://developer.imendio.com/wiki/Devhelp).
 
-Please don't use template files in new projects. Support for for those will
-be removed at some point in the future (together with gtkdoc-mktmpl). Please
-also use DoxBook XML instead of DocBook SGML. 
+Please use DoxBook XML instead of DocBook SGML - support for the later will be
+dropped.
 
 Requirements
 ============
diff --git a/configure.ac b/configure.ac
index 29238be..1c0db4c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -274,7 +274,6 @@ AC_CONFIG_FILES([gtkdoc-mkdb],     [chmod +x gtkdoc-mkdb])
 AC_CONFIG_FILES([gtkdoc-mkhtml],   [chmod +x gtkdoc-mkhtml])
 AC_CONFIG_FILES([gtkdoc-mkman],    [chmod +x gtkdoc-mkman])
 AC_CONFIG_FILES([gtkdoc-mkpdf],    [chmod +x gtkdoc-mkpdf])
-AC_CONFIG_FILES([gtkdoc-mktmpl],   [chmod +x gtkdoc-mktmpl])
 AC_CONFIG_FILES([gtkdoc-rebase],   [chmod +x gtkdoc-rebase])
 AC_CONFIG_FILES([gtkdoc-scan],     [chmod +x gtkdoc-scan])
 AC_CONFIG_FILES([gtkdoc-scangobj], [chmod +x gtkdoc-scangobj])
diff --git a/doc/design-2.x.txt b/doc/design-2.x.txt
index 572c8b5..7c0d319 100644
--- a/doc/design-2.x.txt
+++ b/doc/design-2.x.txt
@@ -7,7 +7,6 @@ Its not about Gtk. Its about C APIs with GObject support.
 g-doc, gapi-doc, gnome-api-doc, ...
 
 == remove and deprecate =
-- get rid of anything related to tmpl (gtkdoc-mktmpl, the makefile rules, ..)
 - get rid of sgml, we will only use docbook xml
 - rename generated index.sgml to something like index.idx - it is not wellformed
   sgml
@@ -19,7 +18,7 @@ g-doc, gapi-doc, gnome-api-doc, ...
 === proper xml-id namesspaces ===
 We need proper xml-id namesspaces for document structure and symbols to avoid
 clashes e.g. between GtkWidget as a section and as a struct. Normal symbols
-should only be mangled to be a valid xml-id. Document structure ids should 
+should only be mangled to be a valid xml-id. Document structure ids should
 contain a prefix.
 
 These are the rules regarding id-attributes:
@@ -33,10 +32,10 @@ http://www.w3.org/TR/xml-id/#id-avn
 "Attributes of type ID are subject to additional normalization rules: removing
  leading and trailing space characters and replacing sequences of spaces with a
  single space."
- 
+
 http://www.w3.org/TR/xml11/#NT-Name
 http://www.w3.org/TR/REC-xml/#NT-Name
- 
+
 So we could easily use "DOC:" as a prefix for document structure ids.
 In 1.x we add :CAPS as a suffix to avoid clashes between lower and uppercase
 constructs. XML-IDs are not case insensitive, so we don't need that.
@@ -49,7 +48,7 @@ If the ID contain a ':' xml processors belive it is using a namespace.
   - we could have a "Section:" tag for non-section comments to add them to a non
     default section
   - we could have a "Private_Symbols:" tag in section to list symbols that
-    should be in private subsection 
+    should be in private subsection
 - the $module.types file need manual maintenance if one need special includes
   - can we make the scanner smarter?
 
diff --git a/gtk-doc.make b/gtk-doc.make
index b091d88..5709b54 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -34,9 +34,9 @@ EXTRA_DIST =                          \
        $(HTML_IMAGES)                  \
        $(SETUP_FILES)
 
-DOC_STAMPS=setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
+DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \
        html-build.stamp pdf-build.stamp \
-       tmpl.stamp sgml.stamp html.stamp pdf.stamp
+       sgml.stamp html.stamp pdf.stamp
 
 SCANOBJ_FILES =                 \
        $(DOC_MODULE).args       \
@@ -96,9 +96,6 @@ setup-build.stamp:
                cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
            done; \
          fi; \
-         test -d $(abs_srcdir)/tmpl && \
-           { cp -pR $(abs_srcdir)/tmpl $(abs_builddir)/; \
-           chmod -R u+w $(abs_builddir)/tmpl; } \
        fi
        $(AM_V_at)touch setup-build.stamp
 
@@ -138,35 +135,14 @@ scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
 $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: 
scan-build.stamp
        @true
 
-#### templates ####
-
-GTK_DOC_V_TMPL=$(GTK_DOC_V_TMPL_$(V))
-GTK_DOC_V_TMPL_=$(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY))
-GTK_DOC_V_TMPL_0=@echo "  DOC   Rebuilding template files";
-
-tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) 
$(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-       $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-       $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-         if test -w $(abs_srcdir) ; then \
-           cp -pR $(abs_builddir)/tmpl $(abs_srcdir)/; \
-         fi \
-       fi
-       $(AM_V_at)touch tmpl-build.stamp
-
-tmpl.stamp: tmpl-build.stamp
-       @true
-
-$(srcdir)/tmpl/*.sgml:
-       @true
-
 #### xml ####
 
 GTK_DOC_V_XML=$(GTK_DOC_V_XML_$(V))
 GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
 GTK_DOC_V_XML_0=@echo "  DOC   Building XML";
 
-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) 
xml/gtkdocentities.ent
-       -$(GTK_DOC_V_XML)chmod -R u+w $(srcdir) && _source_dir='' ; \
+sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) 
$(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent
+       $(GTK_DOC_V_XML)_source_dir='' ; \
        for i in $(DOC_SOURCE_DIR) ; do \
          _source_dir="$${_source_dir} --source-dir=$$i" ; \
        done ; \
@@ -263,7 +239,6 @@ distclean-local:
            $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
        @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
            rm -f $(SETUP_FILES) $(DOC_MODULE).types; \
-           rm -rf tmpl; \
        fi
 
 maintainer-clean-local:
@@ -313,9 +288,7 @@ dist-check-gtkdoc:
 endif
 
 dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local
-       @mkdir $(distdir)/tmpl
        @mkdir $(distdir)/html
-       @-cp ./tmpl/*.sgml $(distdir)/tmpl
        @cp ./html/* $(distdir)/html
        @-cp ./$(DOC_MODULE).pdf $(distdir)/
        @-cp ./$(DOC_MODULE).types $(distdir)/
diff --git a/gtkdoc-mkdb.in b/gtkdoc-mkdb.in
index 91cccec..f065344 100755
--- a/gtkdoc-mkdb.in
+++ b/gtkdoc-mkdb.in
@@ -5712,12 +5712,6 @@ sub MarkDownParse {
 }
 
 #############################################################################
-# LIBRARY FUNCTIONS -        These functions are used in both gtkdoc-mkdb and
-#                        gtkdoc-mktmpl and should eventually be moved to a
-#                        separate library.
-#############################################################################
-
-#############################################################################
 # Function    : ReadDeclarationsFile
 # Description : This reads in a file containing the function/macro/enum etc.
 #                declarations.
@@ -5922,8 +5916,6 @@ sub ReadSignalsFile {
 #               insert the documentation at the appropriate places.
 #               It outputs %SymbolTypes, %SymbolDocs and %SymbolParams, which
 #               is a hash of arrays.
-#               NOTE: This function is duplicated in gtkdoc-mktmpl (but
-#               slightly different).
 # Arguments   : $docsfile - the template file to read in.
 #               $skip_unused_params - 1 if the unused parameters should be
 #                 skipped.
diff --git a/gtkdocize.in b/gtkdocize.in
index 50a041d..a688fc3 100644
--- a/gtkdocize.in
+++ b/gtkdocize.in
@@ -115,16 +115,10 @@ while test $# -gt 0; do
 done
 
 case "$flavour" in
-  legacy-flat*)
+  legacy-flat|no-tmpl-flat)
     makefile=gtk-doc.flat.make
     ;;
-  legacy*)
-    ;;
-  no-tmpl-flat*)
-    makefile=gtk-doc.notmpl-flat.make
-    ;;
-  no-tmpl*)
-    makefile=gtk-doc.notmpl.make
+  legacy|no-tmpl)
     ;;
   *)
     echo "$progname: invalid value for --flavour" 1>&2
diff --git a/help/manual/C/index.docbook b/help/manual/C/index.docbook
index ec2bd31..3c46e77 100644
--- a/help/manual/C/index.docbook
+++ b/help/manual/C/index.docbook
@@ -263,27 +263,6 @@
 
         <listitem>
           <para>
-            <guilabel>Generating the "template" files.</guilabel>
-
-            <application>gtkdoc-mktmpl</application> creates a number of files in
-            the <filename class='directory'>tmpl/</filename> subdirectory, using the
-            information gathered in the first step. (Note that this can be run
-            repeatedly. It will try to ensure that no documentation is ever lost.)
-          </para>
-          <note>
-            <para>
-              Since GTK-Doc 1.9 the templates can be avoided. We encourage people to keep
-              documentation in the code. <application>gtkdocize</application> supports now
-              a <option>--flavour no-tmpl</option> option that chooses a makefile that
-              skips tmpl usage totally.
-              If you have never changed file in tmpl by hand, please remove the directory
-              (e.g. from version control system).
-            </para>
-          </note>
-        </listitem>
-
-        <listitem>
-          <para>
             <guilabel>Generating the XML and HTML/PDF.</guilabel>
 
             <application>gtkdoc-mkdb</application> turns the template files into
@@ -299,7 +278,7 @@
             document called <filename>&lt;package&gt;.pdf</filename>.
           </para>
           <para>
-            Files in <filename class='directory'>xml/</filename> and 
+            Files in <filename class='directory'>xml/</filename> and
             <filename class='directory'>html/</filename> directories are always
             overwritten. One should never edit them directly.
           </para>
@@ -497,12 +476,12 @@ AC_CONFIG_MACRO_DIR(m4)
       <title>Integration with automake</title>
 
       <para>
-        First copy the <filename>Makefile.am</filename> from the 
+        First copy the <filename>Makefile.am</filename> from the
         <filename class='directory'>examples</filename> sub directory of the
         <ulink url="https://git.gnome.org/browse/gtk-doc/tree/examples/Makefile.am";>gtkdoc-sources</ulink>
         to your project's API documentation directory (
         <filename class='directory'>./docs/reference/&lt;package&gt;</filename>).
-        A local copy should be available under e.g. 
+        A local copy should be available under e.g.
         <filename>/usr/share/doc/gtk-doc-tools/examples/Makefile.am</filename>.
         If you have multiple doc-packages repeat this for each one.
       </para>
@@ -711,7 +690,7 @@ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/libmeep/html
     <para>
       The scanner can handle the majority of C headers fine. In the case of
       receiving warnings from the scanner that look like a special case, one can
-      hint GTK-Doc to skip over them. 
+      hint GTK-Doc to skip over them.
       <example><title>GTK-Doc comment block</title>
         <programlisting><![CDATA[
 #ifndef __GTK_DOC_IGNORE__
@@ -725,7 +704,7 @@ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/libmeep/html
       <title>Limitations</title>
       <para>
         Note, that GTK-Doc's supports
-        <code>#ifndef(__GTK_DOC_IGNORE__)</code> but not 
+        <code>#ifndef(__GTK_DOC_IGNORE__)</code> but not
         <code>#if !defined(__GTK_DOC_IGNORE__)</code> or other combinations.
       </para>
     </note>
@@ -862,7 +841,7 @@ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/libmeep/html
       <para>
         In older GTK-Doc releases, if you need support for additional
         formatting, you would need to enable the usage of docbook
-        XML tags inside doc-comments by putting <option>--xml-mode</option> 
+        XML tags inside doc-comments by putting <option>--xml-mode</option>
         (or <option>--sgml-mode</option>) in the variable
         <symbol>MKDB_OPTIONS</symbol> inside <filename>Makefile.am</filename>.
       </para>
@@ -1193,7 +1172,7 @@ foo_get_bar(Foo *foo)
           Documentation blocks can contain annotation-tags. These tags will be
           rendered with tooltips describing their meaning. The tags are used by
           gobject-introspection to generate language bindings. A detailed list
-          of the supported tags can be found on 
+          of the supported tags can be found on
           <ulink url="http://live.gnome.org/GObjectIntrospection/Annotations"; type="http">the wiki</ulink>.
         </para>
 
@@ -1778,17 +1757,17 @@ gtk_arrow_get_type
         In addition a few option elements are created in commented form. You can
         review these and enable them as you like.
       </para>
-      
+
       <para>
         <example><title>Optional part in the master document</title>
           <programlisting><![CDATA[
   <!-- enable this when you use gobject introspection annotations
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
-  -->          
+  -->
 ]]></programlisting>
         </example>
       </para>
-      
+
       <para>
         Finally you need to add new section whenever you introduce one. The
         <link linkend="modernizing-gtk-doc-1-16">gtkdoc-check</link> tool will
@@ -1823,7 +1802,7 @@ gtk_arrow_get_type
         Blank lines are ignored and lines starting with a '#' are treated as
         comment lines.
       </para>
-      
+
       <note>
         <para>
           While the tags make the file look like xml, it is not. Please do not
@@ -1966,15 +1945,15 @@ meep_app_get_type
       <command>GTK_DOC_KEEP_INTERMEDIATE=1 make</command>.
     </para>
   </chapter>
-  
+
   <chapter id="modernizing">
     <title>Modernizing the documentation</title>
-    
+
     <para>
       GTK-Doc has been around for quite some time. In this section we list new
       features together with the version since when it is available.
     </para>
-    
+
     <sect1 id="modernizing-gtk-doc-1-9">
       <title>GTK-Doc 1.9</title>
 
@@ -1982,7 +1961,7 @@ meep_app_get_type
         When using xml instead of sgml, one can actually name the master
         document <filename>&lt;package&gt;-docs.xml</filename>.
       </para>
-      
+
       <para>
         This version supports <option>SCAN_OPTIONS=--rebuild-sections</option>
         in <filename>Makefile.am</filename>. When this is enabled, the
@@ -1990,10 +1969,10 @@ meep_app_get_type
         can be removed from the vcs. This only works nicely for projects that
         have a very regular structure (e.g. each .{c,h} pair will create new
         section). If one organize a project close to that updating a manually
-        maintained section file can be as simple as running 
+        maintained section file can be as simple as running
         <code>meld &lt;package&gt;-decl-list.txt &lt;package&gt;-sections.txt</code>.
       </para>
-      
+
       <para>
         Version 1.8 already introduced the syntax for documenting sections in
         the sources instead of the separate files under <filename class='directory'>tmpl</filename>.
@@ -2004,7 +1983,7 @@ meep_app_get_type
         add the flag to <filename>configure.ac</filename> and you are done.
       </para>
     </sect1>
-    
+
     <sect1 id="modernizing-gtk-doc-1-10">
       <title>GTK-Doc 1.10</title>
 
diff --git a/tests/annotations/docs/Makefile.am b/tests/annotations/docs/Makefile.am
index 416b678..7f8a752 100644
--- a/tests/annotations/docs/Makefile.am
+++ b/tests/annotations/docs/Makefile.am
@@ -24,10 +24,6 @@ SCAN_OPTIONS=--deprecated-guards="GTKDOC_TESTER_DISABLE_DEPRECATED" \
 # Extra options to supply to gtkdoc-mkdb.
 MKDB_OPTIONS=--xml-mode
 
-# Extra options to supply to gtkdoc-mktmpl
-# e.g. MKTMPL_OPTIONS=--only-section-tmpl
-MKTMPL_OPTIONS=
-
 # Extra options to supply to gtkdoc-mkhtml
 MKHTML_OPTIONS=
 
@@ -61,7 +57,7 @@ GTKDOC_CFLAGS = -I$(top_srcdir)/tests/annotations/src $(TEST_DEPS_CFLAGS)
 GTKDOC_LIBS = $(TEST_DEPS_LIBS) $(top_builddir)/tests/annotations/src/libtester.la
 
 # include generic part
-include $(top_srcdir)/tests/gtk-doc.notmpl.make
+include $(top_srcdir)/tests/gtk-doc.make
 
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
diff --git a/tests/bugs/docs/Makefile.am b/tests/bugs/docs/Makefile.am
index 852e1e9..97c4702 100644
--- a/tests/bugs/docs/Makefile.am
+++ b/tests/bugs/docs/Makefile.am
@@ -25,10 +25,6 @@ SCAN_OPTIONS=--deprecated-guards="GTKDOC_TESTER_DISABLE_DEPRECATED" \
 # Extra options to supply to gtkdoc-mkdb.
 MKDB_OPTIONS=--xml-mode
 
-# Extra options to supply to gtkdoc-mktmpl
-# e.g. MKTMPL_OPTIONS=--only-section-tmpl
-MKTMPL_OPTIONS=
-
 # Extra options to supply to gtkdoc-mkhtml
 MKHTML_OPTIONS=
 
@@ -62,7 +58,7 @@ GTKDOC_CFLAGS = -I$(top_srcdir)/tests/bugs/src $(TEST_DEPS_CFLAGS)
 GTKDOC_LIBS = $(TEST_DEPS_LIBS) $(top_builddir)/tests/bugs/src/libtester.la
 
 # include generic part
-include $(top_srcdir)/tests/gtk-doc.notmpl.make
+include $(top_srcdir)/tests/gtk-doc.make
 
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
diff --git a/tests/empty/docs/Makefile.am b/tests/empty/docs/Makefile.am
index 7c183af..4733cb3 100644
--- a/tests/empty/docs/Makefile.am
+++ b/tests/empty/docs/Makefile.am
@@ -30,10 +30,6 @@ SCAN_OPTIONS=--deprecated-guards="GTKDOC_TESTER_DISABLE_DEPRECATED" \
 # Extra options to supply to gtkdoc-mkdb.
 MKDB_OPTIONS=--xml-mode
 
-# Extra options to supply to gtkdoc-mktmpl
-# e.g. MKTMPL_OPTIONS=--only-section-tmpl
-MKTMPL_OPTIONS=
-
 # Extra options to supply to gtkdoc-mkhtml
 MKHTML_OPTIONS=
 
@@ -67,7 +63,7 @@ GTKDOC_CFLAGS = -I$(top_srcdir)/tests/empty/src $(TEST_DEPS_CFLAGS)
 GTKDOC_LIBS = $(TEST_DEPS_LIBS) $(top_builddir)/tests/empty/src/libtester.la
 
 # include generic part
-include $(top_srcdir)/tests/gtk-doc.notmpl.make
+include $(top_srcdir)/tests/gtk-doc.make
 
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
diff --git a/tests/fail/docs/Makefile.am b/tests/fail/docs/Makefile.am
index 5a4f164..8210a80 100644
--- a/tests/fail/docs/Makefile.am
+++ b/tests/fail/docs/Makefile.am
@@ -23,9 +23,6 @@ SCAN_OPTIONS=--deprecated-guards="GTKDOC_TESTER_DISABLE_DEPRECATED" \
 
 # Extra options to supply to gtkdoc-mkdb.
 MKDB_OPTIONS=
-# Extra options to supply to gtkdoc-mktmpl
-# e.g. MKTMPL_OPTIONS=--only-section-tmpl
-MKTMPL_OPTIONS=
 
 # Extra options to supply to gtkdoc-mkhtml
 MKHTML_OPTIONS=
@@ -60,7 +57,7 @@ GTKDOC_CFLAGS = -I$(top_srcdir)/tests/fail/src $(TEST_DEPS_CFLAGS)
 GTKDOC_LIBS = $(TEST_DEPS_LIBS) $(top_builddir)/tests/fail/src/libtester.la
 
 # include generic part
-include $(top_srcdir)/tests/gtk-doc.notmpl.make
+include $(top_srcdir)/tests/gtk-doc.make
 
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
diff --git a/tests/gobject/docs/Makefile.am b/tests/gobject/docs/Makefile.am
index bbd4610..3eb5b7e 100644
--- a/tests/gobject/docs/Makefile.am
+++ b/tests/gobject/docs/Makefile.am
@@ -24,10 +24,6 @@ SCAN_OPTIONS=--deprecated-guards="GTKDOC_TESTER_DISABLE_DEPRECATED" \
 # Extra options to supply to gtkdoc-mkdb.
 MKDB_OPTIONS=--xml-mode
 
-# Extra options to supply to gtkdoc-mktmpl
-# e.g. MKTMPL_OPTIONS=--only-section-tmpl
-MKTMPL_OPTIONS=
-
 # Extra options to supply to gtkdoc-mkhtml
 MKHTML_OPTIONS=
 
@@ -62,7 +58,7 @@ GTKDOC_CFLAGS = -I$(top_srcdir)/tests/gobject/src $(TEST_DEPS_CFLAGS)
 GTKDOC_LIBS = $(TEST_DEPS_LIBS) $(top_builddir)/tests/gobject/src/libtester.la
 
 # include generic part
-include $(top_srcdir)/tests/gtk-doc.notmpl.make
+include $(top_srcdir)/tests/gtk-doc.make
 
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
diff --git a/tests/gtk-doc.notmpl.make b/tests/gtk-doc.make
similarity index 99%
rename from tests/gtk-doc.notmpl.make
rename to tests/gtk-doc.make
index 50480c1..fdccfa0 100644
--- a/tests/gtk-doc.notmpl.make
+++ b/tests/gtk-doc.make
@@ -55,7 +55,6 @@ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) \
   ts \
        gtkdoc-scan.log \
        gtkdoc-scangobj.log \
-       gtkdoc-mktmpl.log \
        gtkdoc-mkdb.log \
        gtkdoc-mkhtml.log \
        gtkdoc-mkpdf.log \
diff --git a/tests/program/docs/Makefile.am b/tests/program/docs/Makefile.am
index 7659310..2bbb4d2 100644
--- a/tests/program/docs/Makefile.am
+++ b/tests/program/docs/Makefile.am
@@ -24,10 +24,6 @@ SCAN_OPTIONS=--deprecated-guards="GTKDOC_TESTER_DISABLE_DEPRECATED" \
 # Extra options to supply to gtkdoc-mkdb.
 MKDB_OPTIONS=--xml-mode
 
-# Extra options to supply to gtkdoc-mktmpl
-# e.g. MKTMPL_OPTIONS=--only-section-tmpl
-MKTMPL_OPTIONS=
-
 # Extra options to supply to gtkdoc-mkhtml
 MKHTML_OPTIONS=
 
@@ -61,7 +57,7 @@ GTKDOC_CFLAGS =
 GTKDOC_LIBS =
 
 # include generic part
-include $(top_srcdir)/tests/gtk-doc.notmpl.make
+include $(top_srcdir)/tests/gtk-doc.make
 
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
diff --git a/tests/tools.sh.in b/tests/tools.sh.in
index 232c544..ab9e5cf 100644
--- a/tests/tools.sh.in
+++ b/tests/tools.sh.in
@@ -10,7 +10,7 @@ echo "Running suite(s): gtk-doc-$suite";
 # we can use which here as we override the path in TEST_ENVIRONMENT
 
 # test perl scripts
-for file in gtkdoc-check gtkdoc-fixxref gtkdoc-mkdb gtkdoc-mktmpl gtkdoc-rebase gtkdoc-scan gtkdoc-scangobj 
; do
+for file in gtkdoc-check gtkdoc-fixxref gtkdoc-mkdb gtkdoc-rebase gtkdoc-scan gtkdoc-scangobj ; do
   @PERL@ -cwT `which $file`
   if test $? = 1 ; then failed=`expr $failed + 1`; fi
   tested=`expr $tested + 1`
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]