[gtk-doc] Fix .gitignores



commit b6f0a1f5543ed8e4723fd6d6cfa81f60d485a99b
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Thu May 21 19:25:42 2015 -0500

    Fix .gitignores
    
    Don't put .gitignore files under version control: they're generated by
    git.mk.
    
    Update git.mk and hook it up in Makefile.am.
    
    Update remaining Makefile.am to get to a clean git status.
    
    Don't clean/ignore files in $(srcdir) -- this makes no sense because
    only generated files should be ignored, and generated files should be
    generated in $(builddir).
    
    https://bugzilla.gnome.org/show_bug.cgi?id=749706

 .gitignore                         |   77 ------------
 Makefile.am                        |   47 ++++----
 git.mk                             |  224 +++++++++++++++++++++++++++++------
 help/manual/.gitignore             |   78 -------------
 help/manual/Makefile.am            |    2 +
 tests/.gitignore                   |   24 ----
 tests/annotations/Makefile.am      |    1 -
 tests/annotations/docs/Makefile.am |    9 +-
 tests/bugs/docs/Makefile.am        |   10 +-
 tests/empty/docs/Makefile.am       |   12 +--
 tests/fail/docs/Makefile.am        |    9 +-
 tests/gobject/docs/Makefile.am     |   10 +-
 tests/gtk-doc.notmpl.make          |   14 ++-
 13 files changed, 240 insertions(+), 277 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index de22c19..47c9008 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -87,31 +87,36 @@ CLEANFILES = \
   gtk-doc.flat.make \
   gtk-doc.notmpl-flat.make \
   gtkdoc-depscanc
+  
+DISTCLEANFILES = \
+  gtk-doc.cat \
+  gtkdoc-check \
+  gtkdoc-common.pl \
+  gtkdoc-depscan \
+  gtk-doc.dsl \
+  gtkdoc-fixxref \
+  gtkdocize \
+  gtkdoc-mkdb \
+  gtkdoc-mkhtml \
+  gtkdoc-mkman \
+  gtkdoc-mkpdf \
+  gtkdoc-mktmpl \
+  gtk-doc.pc \
+  gtkdoc-rebase \
+  gtkdoc-scangobj \
+  gtkdoc-scan \
+  gtk-doc.spec
 
-MAINTAINERCLEANFILES = \
-  build-aux \
-       $(srcdir)/INSTALL \
-       $(srcdir)/COPYING \
-       $(srcdir)/aclocal.m4 \
-       $(srcdir)/autoregen.sh \
-       $(srcdir)/compile \
-       $(srcdir)/config.guess \
-       $(srcdir)/config.h.in \
-       $(srcdir)/config.sub \
-       $(srcdir)/configure.scan \
-       $(srcdir)/depcomp \
-       $(srcdir)/install-sh \
-       $(srcdir)/ltmain.sh \
-       $(srcdir)/m4 \
-       $(srcdir)/missing \
-       $(srcdir)/mkinstalldirs \
-       $(srcdir)/gtk-doc-utils.make \
-       $(srcdir)/ChangeLog
 
-GITIGNOREFILES = \
+MAINTAINERCLEANFILES = \
+       $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
+       $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
+       $(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \
+       INSTALL \
        RELNOTES.txt \
        ChangeLog-?.?? \
-       gtk-doc-*.tar.xz
+       gtk-doc-*.tar.xz \
+       build-aux
 
 -include $(top_srcdir)/git.mk
 
diff --git a/git.mk b/git.mk
index 5ab41ba..9d4bf25 100644
--- a/git.mk
+++ b/git.mk
@@ -1,18 +1,25 @@
-# git.mk
+# git.mk, a small Makefile to autogenerate .gitignore files
+# for autotools-based projects.
 #
 # Copyright 2009, Red Hat, Inc.
+# Copyright 2010,2011,2012,2013 Behdad Esfahbod
 # Written by Behdad Esfahbod
 #
 # Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
+# is permitted in any medium without royalty provided the copyright
 # notice and this notice are preserved.
 #
-# The canonical source for this file is pango/git.mk, or whereever the
-# header of pango/git.mk suggests in the future.
+# The latest version of this file can be downloaded from:
+GIT_MK_URL = https://raw.githubusercontent.com/behdad/git.mk/master/git.mk
+#
+# Bugs, etc, should be reported upstream at:
+#   https://github.com/behdad/git.mk
 #
 # To use in your project, import this file in your git repo's toplevel,
 # then do "make -f git.mk".  This modifies all Makefile.am files in
-# your project to include git.mk.
+# your project to -include git.mk.  Remember to add that line to new
+# Makefile.am files you create in your project, or just rerun the
+# "make -f git.mk".
 #
 # This enables automatic .gitignore generation.  If you need to ignore
 # more files, add them to the GITIGNOREFILES variable in your Makefile.am.
@@ -22,7 +29,7 @@
 #
 # The only case that you need to manually add a file to GITIGNOREFILES is
 # when remove files in one of mostlyclean-local, clean-local, distclean-local,
-# or maintainer-clean-local.
+# or maintainer-clean-local make targets.
 #
 # Note that for files like editor backup, etc, there are better places to
 # ignore them.  See "man gitignore".
@@ -30,18 +37,25 @@
 # If "make maintainer-clean" removes the files but they are not recognized
 # by this script (that is, if "git status" shows untracked files still), send
 # me the output of "git status" as well as your Makefile.am and Makefile for
-# the directories involved.
+# the directories involved and I'll diagnose.
 #
 # For a list of toplevel files that should be in MAINTAINERCLEANFILES, see
-# pango/Makefile.am.
+# Makefile.am.sample in the git.mk git repo.
 #
 # Don't EXTRA_DIST this file.  It is supposed to only live in git clones,
 # not tarballs.  It serves no useful purpose in tarballs and clutters the
 # build dir.
 #
 # This file knows how to handle autoconf, automake, libtool, gtk-doc,
-# gnome-doc-utils, intltool.
+# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings, dejagnu, appdata,
+# appstream.
+#
+# This makefile provides the following targets:
 #
+# - all: "make all" will build all gitignore files.
+# - gitignore: makes all gitignore files in the current dir and subdirs.
+# - .gitignore: make gitignore file for the current dir.
+# - gitignore-recurse: makes all gitignore files in the subdirs.
 #
 # KNOWN ISSUES:
 #
@@ -53,13 +67,74 @@
 #   example.
 #
 
+
+
+###############################################################################
+# Variables user modules may want to add to toplevel MAINTAINERCLEANFILES:
+###############################################################################
+
+#
+# Most autotools-using modules should be fine including this variable in their
+# toplevel MAINTAINERCLEANFILES:
+GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \
+       $(srcdir)/aclocal.m4 \
+       $(srcdir)/autoscan.log \
+       $(srcdir)/configure.scan \
+       `AUX_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_AUX_DIR:$$1' ./configure.ac); \
+        test "x$$AUX_DIR" = "x$(srcdir)/" && AUX_DIR=$(srcdir); \
+        for x in \
+               ar-lib \
+               compile \
+               config.guess \
+               config.sub \
+               depcomp \
+               install-sh \
+               ltmain.sh \
+               missing \
+               mkinstalldirs \
+               test-driver \
+               ylwrap \
+        ; do echo "$$AUX_DIR/$$x"; done` \
+       `cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_HEADERS:$$1' ./configure.ac | \
+       head -n 1 | while read f; do echo "$(srcdir)/$$f.in"; done`
+#
+# All modules should also be fine including the following variable, which
+# removes automake-generated Makefile.in files:
+GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN = \
+       `cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_FILES:$$1' ./configure.ac | \
+       while read f; do \
+         case $$f in Makefile|*/Makefile) \
+           test -f "$(srcdir)/$$f.am" && echo "$(srcdir)/$$f.in";; esac; \
+       done`
+#
+# Modules that use libtool and use  AC_CONFIG_MACRO_DIR() may also include this,
+# though it's harmless to include regardless.
+GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL = \
+       `MACRO_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_MACRO_DIR:$$1' 
./configure.ac); \
+        if test "x$$MACRO_DIR" != "x$(srcdir)/"; then \
+               for x in \
+                       libtool.m4 \
+                       ltoptions.m4 \
+                       ltsugar.m4 \
+                       ltversion.m4 \
+                       lt~obsolete.m4 \
+               ; do echo "$$MACRO_DIR/$$x"; done; \
+        fi`
+
+
+
+###############################################################################
+# Default rule is to install ourselves in all Makefile.am files:
+###############################################################################
+
 git-all: git-mk-install
 
 git-mk-install:
-       @echo Installing git makefile
-       @any_failed=; find $(top_srcdir) -name Makefile.am | while read x; do \
+       @echo "Installing git makefile"
+       @any_failed=; \
+               find "`test -z "$(top_srcdir)" && echo . || echo "$(top_srcdir)"`" -name Makefile.am | while 
read x; do \
                if grep 'include .*/git.mk' $$x >/dev/null; then \
-                       echo $$x already includes git.mk; \
+                       echo "$$x already includes git.mk"; \
                else \
                        failed=; \
                        echo "Updating $$x"; \
@@ -71,19 +146,25 @@ git-mk-install:
                                mv $$x.tmp $$x || failed=1; \
                        fi; \
                        if test x$$failed = x; then : else \
-                               echo Failed updating $$x; >&2 \
+                               echo "Failed updating $$x"; >&2 \
                                any_failed=1; \
                        fi; \
        fi; done; test -z "$$any_failed"
 
-.PHONY: git-all git-mk-install
+git-mk-update:
+       wget $(GIT_MK_URL) -O $(top_srcdir)/git.mk
+
+.PHONY: git-all git-mk-install git-mk-update
 
 
-### .gitignore generation
+
+###############################################################################
+# Actual .gitignore generation:
+###############################################################################
 
 $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
-       $(AM_V_GEN) \
-       { \
+       @echo "git.mk: Generating $@"
+       @{ \
                if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
                        for x in \
                                $(DOC_MODULE)-decl-list.txt \
@@ -91,35 +172,74 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
                                tmpl/$(DOC_MODULE)-unused.sgml \
                                "tmpl/*.bak" \
                                xml html \
-                       ; do echo /$$x; done; \
+                       ; do echo "/$$x"; done; \
+                       FLAVOR=$$(cd $(top_srcdir); $(AUTOCONF) --trace 'GTK_DOC_CHECK:$$2' ./configure.ac); \
+                       case $$FLAVOR in *no-tmpl*) echo /tmpl;; esac; \
                fi; \
-               if test "x$(DOC_MODULE)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
+               if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
+                       for lc in $(DOC_LINGUAS); do \
+                               for x in \
+                                       $(if $(DOC_MODULE),$(DOC_MODULE).xml) \
+                                       $(DOC_PAGES) \
+                                       $(DOC_INCLUDES) \
+                               ; do echo "/$$lc/$$x"; done; \
+                       done; \
                        for x in \
-                               $(_DOC_C_DOCS) \
-                               $(_DOC_LC_DOCS) \
                                $(_DOC_OMF_ALL) \
                                $(_DOC_DSK_ALL) \
                                $(_DOC_HTML_ALL) \
-                               $(_DOC_POFILES) \
+                               $(_DOC_MOFILES) \
+                               $(DOC_H_FILE) \
                                "*/.xml2po.mo" \
                                "*/*.omf.out" \
                        ; do echo /$$x; done; \
                fi; \
+               if test "x$(HELP_ID)" = x -o "x$(HELP_LINGUAS)" = x; then :; else \
+                       for lc in $(HELP_LINGUAS); do \
+                               for x in \
+                                       $(HELP_FILES) \
+                                       "$$lc.stamp" \
+                                       "$$lc.mo" \
+                               ; do echo "/$$lc/$$x"; done; \
+                       done; \
+               fi; \
+               if test "x$(gsettings_SCHEMAS)" = x; then :; else \
+                       for x in \
+                               $(gsettings_SCHEMAS:.xml=.valid) \
+                               $(gsettings__enum_file) \
+                       ; do echo "/$$x"; done; \
+               fi; \
+               if test "x$(appdata_XML)" = x; then :; else \
+                       for x in \
+                               $(appdata_XML:.xml=.valid) \
+                       ; do echo "/$$x"; done; \
+               fi; \
+               if test "x$(appstream_XML)" = x; then :; else \
+                       for x in \
+                               $(appstream_XML:.xml=.valid) \
+                       ; do echo "/$$x"; done; \
+               fi; \
                if test -f $(srcdir)/po/Makefile.in.in; then \
                        for x in \
                                po/Makefile.in.in \
+                               po/Makefile.in.in~ \
                                po/Makefile.in \
                                po/Makefile \
+                               po/Makevars.template \
                                po/POTFILES \
+                               po/Rules-quot \
                                po/stamp-it \
                                po/.intltool-merge-cache \
                                "po/*.gmo" \
+                               "po/*.header" \
                                "po/*.mo" \
+                               "po/*.sed" \
+                               "po/*.sin" \
                                po/$(GETTEXT_PACKAGE).pot \
                                intltool-extract.in \
                                intltool-merge.in \
                                intltool-update.in \
-                       ; do echo /$$x; done; \
+                       ; do echo "/$$x"; done; \
                fi; \
                if test -f $(srcdir)/configure; then \
                        for x in \
@@ -129,21 +249,38 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
                                stamp-h1 \
                                libtool \
                                config.lt \
-                       ; do echo /$$x; done; \
+                       ; do echo "/$$x"; done; \
+               fi; \
+               if test "x$(DEJATOOL)" = x; then :; else \
+                       for x in \
+                               $(DEJATOOL) \
+                       ; do echo "/$$x.sum"; echo "/$$x.log"; done; \
+                       echo /site.exp; \
+               fi; \
+               if test "x$(am__dirstamp)" = x; then :; else \
+                       echo "$(am__dirstamp)"; \
+               fi; \
+               if test "x$(LTCOMPILE)" = x -a "x$(LTCXXCOMPILE)" = x -a "x$(GTKDOC_RUN)" = x; then :; else \
+                       for x in \
+                               "*.lo" \
+                               ".libs" "_libs" \
+                       ; do echo "$$x"; done; \
                fi; \
                for x in \
                        .gitignore \
                        $(GITIGNOREFILES) \
                        $(CLEANFILES) \
-                       $(PROGRAMS) \
-                       $(check_PROGRAMS) \
-                       $(EXTRA_PROGRAMS) \
-                       $(LTLIBRARIES) \
+                       $(PROGRAMS) $(check_PROGRAMS) $(EXTRA_PROGRAMS) \
+                       $(LIBRARIES) $(check_LIBRARIES) $(EXTRA_LIBRARIES) \
+                       $(LTLIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LTLIBRARIES) \
                        so_locations \
-                       .libs _libs \
                        $(MOSTLYCLEANFILES) \
-                       "*.$(OBJEXT)" \
-                       "*.lo" \
+                       $(TEST_LOGS) \
+                       $(TEST_LOGS:.log=.trs) \
+                       $(TEST_SUITE_LOG) \
+                       $(TESTS:=.test) \
+                       "*.gcda" \
+                       "*.gcno" \
                        $(DISTCLEANFILES) \
                        $(am__CONFIG_DISTCLEAN_FILES) \
                        $(CONFIG_CLEAN_FILES) \
@@ -151,7 +288,10 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
                        "*.tab.c" \
                        $(MAINTAINERCLEANFILES) \
                        $(BUILT_SOURCES) \
-                       $(DEPDIR) \
+                       $(patsubst %.vala,%.c,$(filter %.vala,$(SOURCES))) \
+                       $(filter %_vala.stamp,$(DIST_COMMON)) \
+                       $(filter %.vapi,$(DIST_COMMON)) \
+                       $(filter $(addprefix %,$(notdir $(patsubst %.vapi,%.h,$(filter 
%.vapi,$(DIST_COMMON))))),$(DIST_COMMON)) \
                        Makefile \
                        Makefile.in \
                        "*.orig" \
@@ -159,7 +299,12 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
                        "*.bak" \
                        "*~" \
                        ".*.sw[nop]" \
-               ; do echo /$$x; done; \
+                       ".dirstamp" \
+               ; do echo "/$$x"; done; \
+               for x in \
+                       "*.$(OBJEXT)" \
+                       $(DEPDIR) \
+               ; do echo "$$x"; done; \
        } | \
        sed "s ^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
        sed 's@/[.]/@/@g' | \
@@ -167,18 +312,19 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
        mv $  tmp $@;
 
 all: $(srcdir)/.gitignore gitignore-recurse-maybe
+gitignore: $(srcdir)/.gitignore gitignore-recurse
+
 gitignore-recurse-maybe:
-       @if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \
-               $(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \
-       fi;
-gitignore-recurse:
        @for subdir in $(DIST_SUBDIRS); do \
          case " $(SUBDIRS) " in \
            *" $$subdir "*) :;; \
-           *) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || 
echo "Skipping $$subdir");; \
+           *) test "$$subdir" = . -o -e "$$subdir/.git" || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) gitignore 
|| echo "Skipping $$subdir");; \
          esac; \
        done
-gitignore: $(srcdir)/.gitignore gitignore-recurse
+gitignore-recurse:
+       @for subdir in $(DIST_SUBDIRS); do \
+           test "$$subdir" = . -o -e "$$subdir/.git" || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) gitignore || 
echo "Skipping $$subdir"); \
+       done
 
 maintainer-clean: gitignore-clean
 gitignore-clean:
diff --git a/help/manual/Makefile.am b/help/manual/Makefile.am
index ae8af76..1c8fcfa 100644
--- a/help/manual/Makefile.am
+++ b/help/manual/Makefile.am
@@ -12,4 +12,6 @@ HELP_LINGUAS = bn_IN de el en_GB es fr gl gu pt_BR sl sv ta te zh_CN
 
 CLEANFILES = $(_HELP_LC_FILES) $(_HELP_LC_STAMPS) $(_HELP_MOFILES)
 
+GITIGNOREFILES = ??_??/$(HELP_ID).xml ??/$(HELP_ID).xml
+
 -include $(top_srcdir)/git.mk
diff --git a/tests/annotations/Makefile.am b/tests/annotations/Makefile.am
index ad34ec6..1653011 100644
--- a/tests/annotations/Makefile.am
+++ b/tests/annotations/Makefile.am
@@ -8,5 +8,4 @@ check-local: clean
 
 endif
 
-
 -include $(top_srcdir)/git.mk
diff --git a/tests/annotations/docs/Makefile.am b/tests/annotations/docs/Makefile.am
index 5f7563b..416b678 100644
--- a/tests/annotations/docs/Makefile.am
+++ b/tests/annotations/docs/Makefile.am
@@ -67,13 +67,8 @@ include $(top_srcdir)/tests/gtk-doc.notmpl.make
 # e.g. EXTRA_DIST += version.xml.in
 EXTRA_DIST +=
 
-DISTCLEANFILES = \
-       gtkdoc-scan.log \
-       gtkdoc-scangobj.log \
-       gtkdoc-mktmpl.log \
-       gtkdoc-mkdb.log \
-       gtkdoc-mkhtml.log \
-       gtkdoc-fixxref.log
+CLEANFILES += \
+  $(DOC_MODULE)-overrides.txt
 
 if BUILD_TESTS
 TESTS_ENVIRONMENT = \
diff --git a/tests/bugs/docs/Makefile.am b/tests/bugs/docs/Makefile.am
index edcdab5..852e1e9 100644
--- a/tests/bugs/docs/Makefile.am
+++ b/tests/bugs/docs/Makefile.am
@@ -68,13 +68,9 @@ include $(top_srcdir)/tests/gtk-doc.notmpl.make
 # e.g. EXTRA_DIST += version.xml.in
 EXTRA_DIST +=
 
-DISTCLEANFILES = \
-       gtkdoc-scan.log \
-       gtkdoc-scangobj.log \
-       gtkdoc-mktmpl.log \
-       gtkdoc-mkdb.log \
-       gtkdoc-mkhtml.log \
-       gtkdoc-fixxref.log
+CLEANFILES += \
+  $(DOC_MODULE)-overrides.txt \
+  $(DOC_MODULE).types
 
 if BUILD_TESTS
 TESTS_ENVIRONMENT = \
diff --git a/tests/empty/docs/Makefile.am b/tests/empty/docs/Makefile.am
index 2e1f0e4..7c183af 100644
--- a/tests/empty/docs/Makefile.am
+++ b/tests/empty/docs/Makefile.am
@@ -73,13 +73,9 @@ include $(top_srcdir)/tests/gtk-doc.notmpl.make
 # e.g. EXTRA_DIST += version.xml.in
 EXTRA_DIST +=
 
-DISTCLEANFILES = \
-       gtkdoc-scan.log \
-       gtkdoc-scangobj.log \
-       gtkdoc-mktmpl.log \
-       gtkdoc-mkdb.log \
-       gtkdoc-mkhtml.log \
-       gtkdoc-fixxref.log
+CLEANFILES += \
+  $(DOC_MODULE)-overrides.txt \
+  $(DOC_MODULE).types
 
 if BUILD_TESTS
 TESTS_ENVIRONMENT = \
@@ -88,7 +84,7 @@ TESTS_ENVIRONMENT = \
        PERL5LIB=$(abs_top_builddir):$(PERL5LIB)
 endif
 
-GITIGNOREFILES = \
+CLEANFILES += \
        tester-docs.xml \
        tester-sections.txt
 
diff --git a/tests/fail/docs/Makefile.am b/tests/fail/docs/Makefile.am
index a1a7096..5a4f164 100644
--- a/tests/fail/docs/Makefile.am
+++ b/tests/fail/docs/Makefile.am
@@ -66,13 +66,8 @@ include $(top_srcdir)/tests/gtk-doc.notmpl.make
 # e.g. EXTRA_DIST += version.xml.in
 EXTRA_DIST +=
 
-DISTCLEANFILES = \
-       gtkdoc-scan.log \
-       gtkdoc-scangobj.log \
-       gtkdoc-mktmpl.log \
-       gtkdoc-mkdb.log \
-       gtkdoc-mkhtml.log \
-       gtkdoc-fixxref.log
+CLEANFILES += \
+  $(DOC_MODULE)-overrides.txt
 
 if BUILD_TESTS
 TESTS_ENVIRONMENT = \
diff --git a/tests/gobject/docs/Makefile.am b/tests/gobject/docs/Makefile.am
index 5b8db29..bbd4610 100644
--- a/tests/gobject/docs/Makefile.am
+++ b/tests/gobject/docs/Makefile.am
@@ -68,13 +68,9 @@ include $(top_srcdir)/tests/gtk-doc.notmpl.make
 # e.g. EXTRA_DIST += version.xml.in
 EXTRA_DIST += tester.types
 
-DISTCLEANFILES = \
-       gtkdoc-scan.log \
-       gtkdoc-scangobj.log \
-       gtkdoc-mktmpl.log \
-       gtkdoc-mkdb.log \
-       gtkdoc-mkhtml.log \
-       gtkdoc-fixxref.log
+CLEANFILES += \
+  $(DOC_MODULE)-overrides.txt \
+  $(DOC_MODULE).types
 
 if BUILD_TESTS
 TESTS_ENVIRONMENT = \
diff --git a/tests/gtk-doc.notmpl.make b/tests/gtk-doc.notmpl.make
index f9a8343..e247da9 100644
--- a/tests/gtk-doc.notmpl.make
+++ b/tests/gtk-doc.notmpl.make
@@ -50,7 +50,19 @@ REPORT_FILES = \
        $(DOC_MODULE)-undeclared.txt \
        $(DOC_MODULE)-unused.txt
 
-CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
+CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) \
+  $(DOC_MODULE).pdf \
+  ts \
+       gtkdoc-scan.log \
+       gtkdoc-scangobj.log \
+       gtkdoc-mktmpl.log \
+       gtkdoc-mkdb.log \
+       gtkdoc-mkhtml.log \
+       gtkdoc-mkpdf.log \
+       gtkdoc-fixxref.log
+
+GITIGNOREFILES = \
+  html.ref xml.ref
 
 check-local: html-build.stamp pdf-build.stamp
        @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]