From 36da85ecbe5791e372cc0b689bf00c3c1167d185 Mon Sep 17 00:00:00 2001
From: Dan Nicholson <dbn@endlessos.org>
Date: Wed, 7 Apr 2021 13:36:01 -0600
Subject: [PATCH 1/2] Remove apidoc .gitignore from version control

Like the top level .gitignore, there's no reason to track this if it's
being generated automatically. It only produces spurious diff changes
that you almost certainly don't want.
---
 apidoc/.gitignore | 53 -----------------------------------------------
 1 file changed, 53 deletions(-)
 delete mode 100644 apidoc/.gitignore

diff --git a/apidoc/.gitignore b/apidoc/.gitignore
deleted file mode 100644
index 80d2c112..00000000
--- a/apidoc/.gitignore
+++ /dev/null
@@ -1,53 +0,0 @@
-*.lo
-*.o
-.deps
-.libs
-/*.bak
-/*.gcda
-/*.gcno
-/*.orig
-/*.rej
-/*.tab.c
-/*~
-/.*.sw[nop]
-/.dirstamp
-/.gitignore
-/GPATH
-/GRTAGS
-/GSYMS
-/GTAGS
-/ID
-/Makefile
-/Makefile.in
-/TAGS
-/gtkdoc-check.test
-/html
-/html-build.stamp
-/html.stamp
-/ostree-decl-list.txt
-/ostree-decl.txt
-/ostree-undeclared.txt
-/ostree-undocumented.txt
-/ostree-unused.txt
-/ostree.args
-/ostree.hierarchy
-/ostree.interfaces
-/ostree-overrides.txt
-/ostree.pdf
-/ostree.prerequisites
-/ostree.signals
-/ostree.types
-/pdf-build.stamp
-/pdf.stamp
-/scan-build.stamp
-/setup-build.stamp
-/sgml-build.stamp
-/sgml.stamp
-/so_locations
-/tags
-/tmpl
-/tmpl/*.bak
-/tmpl/ostree-unused.sgml
-/xml
-/version.xml
-_libs

From d05e7ba2e2c07d010b44855f114ee19ce7a72103 Mon Sep 17 00:00:00 2001
From: Dan Nicholson <dbn@endlessos.org>
Date: Wed, 7 Apr 2021 13:37:53 -0600
Subject: [PATCH 2/2] Ensure consistent apidoc .gitignore

If you don't configure with --enable-gtk-doc, these won't be included in
the generated .gitignore. If you later configure with --enable-gtk-doc
in the same checkout, they'll show up as untracked files. Include them
in GITIGNOREFILES to ensure they're always added regardless of configure
options.
---
 apidoc/Makefile.am | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/apidoc/Makefile.am b/apidoc/Makefile.am
index 98a84d5f..774cee60 100644
--- a/apidoc/Makefile.am
+++ b/apidoc/Makefile.am
@@ -125,4 +125,11 @@ EXTRA_DIST += \
 	ostree-experimental-sections.txt \
 	$(NULL)
 
+# These only get included in the generated .gitignore when building with
+# --enable-gtk-doc, so ensure they're always added.
+GITIGNOREFILES = \
+	ostree-overrides.txt \
+	version.xml \
+	$(NULL)
+
 -include $(top_srcdir)/git.mk