bash-completion: update options before release

[thirdparty/util-linux.git] / config / gtk-doc.make

diff --git a/config/gtk-doc.make b/config/gtk-doc.make
index 9d34d5131e6cd23d02f29b86aea7bad4a964ae4d..74dbd365e0366f038be7d9e98268289c1c2a5cca 100644 (file)
--- a/config/gtk-doc.make
+++ b/config/gtk-doc.make
@@ -34,6 +34,8 @@ GPATH = $(srcdir)
 
 TARGET_DIR=$(docdir)/$(DOC_MODULE)
 
+DISTCLEANFILES =
+
 EXTRA_DIST =                           \
        $(content_files)                \
        $(HTML_IMAGES)                  \
@@ -50,7 +52,8 @@ SCANOBJ_FILES =                \
        $(DOC_MODULE).hierarchy  \
        $(DOC_MODULE).interfaces \
        $(DOC_MODULE).prerequisites \
-       $(DOC_MODULE).signals
+       $(DOC_MODULE).signals    \
+        $(DOC_MODULE).types            # util-linux: we don't use types
 
 REPORT_FILES = \
        $(DOC_MODULE)-undocumented.txt \
@@ -69,7 +72,6 @@ docs: html-build.stamp
 
 $(REPORT_FILES): sgml-build.stamp
 
-
 #### setup ####
 
 setup-build.stamp:
@@ -100,6 +102,7 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) $(srcdir)/$(DOC_MODULE)-*.txt $(co
        $(AM_V_GEN)gtkdoc-scan --module=$(DOC_MODULE) \
                    --source-dir=$(srcdir)/$(DOC_SOURCE_DIR) \
                    --source-dir=$(builddir)/$(DOC_SOURCE_DIR) \
+                    --ignore-decorators="__ul_attribute__\(.*\)" \
                    --ignore-headers="$(IGNORE_HFILES)" \
                    --output-dir=$(builddir) \
                    $(SCAN_OPTIONS) $(EXTRA_HFILES)
@@ -166,6 +169,7 @@ html-build.stamp: sgml.stamp $(srcdir)/$(DOC_MAIN_SGML_FILE) $(content_files)
                ( cd $(srcdir) && cp $(HTML_IMAGES) $(abs_builddir)/html )
 
        $(AM_V_GEN)gtkdoc-fixxref --module-dir=html \
+                      --module=$(DOC_MODULE) \
                       --html-dir=$(HTML_DIR) \
                       $(FIXXREF_OPTIONS)
        @touch html-build.stamp
@@ -181,7 +185,7 @@ distclean-local:
               $(DOC_MODULE)-overrides.txt \
               $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
        test $(abs_builddir) ==  $(abs_srcdir) || \
-              rm -f $(DOC_MODULE)-sections.txt
+              rm -f $(DOC_MODULE)-*.txt $(DOC_MODULE)-*.xml *.xml.in
 
 install-data-local:
        installfiles=`echo $(builddir)/html/*`; \